[WIP] Groundwork for loading new type maps

Author: grendello

src/monodroid/jni/embedded-assemblies.cc

@@ -447,25 +447,41 @@ EmbeddedAssemblies::gather_bundled_assemblies_from_apk (const char* apk, monodro
 }
 
 #if defined (DEBUG) || !defined (ANDROID)
+bool
+EmbeddedAssemblies::typemap_load_index (const char *index_path)
+{
+	return false;
+}
+
 void
 EmbeddedAssemblies::try_load_typemaps_from_directory (const char *path)
 {
 	// read the entire typemap file into a string
 	// process the string using the add_type_mapping
-	char *dir_path = utils.path_combine (path, "typemaps");
-	if (dir_path == nullptr || !utils.directory_exists (dir_path)) {
-		log_warn (LOG_DEFAULT, "directory does not exist: `%s`", dir_path);
-		free (dir_path);
+	simple_pointer_guard<char[]> dir_path (utils.path_combine (path, "typemaps"));
+
+	if (!utils.directory_exists (dir_path)) {
+		log_warn (LOG_DEFAULT, "directory does not exist: `%s`", dir_path.get ());
 		return;
 	}
 
 	monodroid_dir_t *dir;
 	if ((dir = utils.monodroid_opendir (dir_path)) == nullptr) {
-		log_warn (LOG_DEFAULT, "could not open directory: `%s`", dir_path);
-		free (dir_path);
+		log_warn (LOG_DEFAULT, "could not open directory: `%s`", dir_path.get ());
 		return;
 	}
 
+	simple_pointer_guard<char[]> index_path (utils.path_combine (dir_path, "typemap.index"));
+	if (!utils.file_exists (index_path)) {
+		log_fatal (LOG_ASSEMBLY, "TypeMap data index file not found: %s", index_path.get ());
+		exit (FATAL_EXIT_NO_ASSEMBLIES); // TODO: use a new error code here
+	}
+
+	if (!typemap_load_index (index_path)) {
+		log_fatal (LOG_ASSEMBLY, "Unable to load TypeMap data index from '%s'", index_path.get ());
+		exit (FATAL_EXIT_NO_ASSEMBLIES); // TODO: use a new error code here
+	}
+
 	monodroid_dirent_t *e;
 	while ((e = androidSystem.readdir (dir)) != nullptr) {
 #if WINDOWS
@@ -489,8 +505,6 @@ EmbeddedAssemblies::try_load_typemaps_from_directory (const char *path)
 		}
 	}
 	utils.monodroid_closedir (dir);
-	free (dir_path);
-	return;
 }
 #endif
 

src/monodroid/jni/embedded-assemblies.hh

@@ -72,6 +72,7 @@ namespace xamarin::android::internal {
 		void extract_int (const char **header, const char *source_apk, const char *source_entry, const char *key_name, int *value);
 #if defined (DEBUG) || !defined (ANDROID)
 		bool add_type_mapping (TypeMappingInfo **info, const char *source_apk, const char *source_entry, const char *addr);
+		bool typemap_load_index (const char *index_path);
 #endif // DEBUG || !ANDROID
 		bool register_debug_symbols_for_assembly (const char *entry_name, MonoBundledAssembly *assembly, const mono_byte *debug_contents, int debug_size);