Runtime config binary blob is now fully embedded

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

@@ -212,7 +212,7 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
 					apk.Flush ();
 				}
 
-				AddRuntimeConfigBlob (apk);
+//				AddRuntimeConfigBlob (apk);
 				AddRuntimeLibraries (apk, supportedAbis);
 				apk.Flush();
 				AddNativeLibraries (files, supportedAbis);

src/Xamarin.Android.Build.Tasks/Utilities/ELFEmbeddingHelper.cs

@@ -144,9 +144,13 @@ static void DoEmbed (
 			throw new NotSupportedException ($"Internal error: unsupported target arch '{arch}'");
 		}
 
+		inputFile = Path.GetFullPath (inputFile);
+		outputFile = Path.GetFullPath (outputFile);
+
 		var fi = new FileInfo (inputFile);
 		long inputFileSize = fi.Length;
 		string asmInputFile = Path.ChangeExtension (outputFile, ".s");
+		string sanitizedInputFilePath = inputFile.Replace ("\\", "\\\\");
 
 		using var fs = File.Open (asmInputFile, FileMode.Create, FileAccess.Write, FileShare.Read);
 		using var sw = new StreamWriter (fs, asmFileEncoding);
@@ -158,7 +162,7 @@ static void DoEmbed (
 		sw.WriteLine ($".global {symbolName}");
 		sw.WriteLine ($".type {symbolName},{cfg.AssemblerDirectivePrefix}object");
 		sw.WriteLine ($"{symbolName}:");
-		sw.WriteLine ($"\t.incbin \"{inputFile}\"");
+		sw.WriteLine ($"\t.incbin \"{sanitizedInputFilePath}\"");
 		sw.WriteLine ($"\t.size {symbolName}, {inputFileSize}");
 		sw.WriteLine ();
 

src/native/monodroid/embedded-assemblies-zip.cc

@@ -63,13 +63,13 @@ EmbeddedAssemblies::zip_load_entry_common (size_t entry_index, std::vector<uint8
 		}
 	}
 
-	if (application_config.have_runtime_config_blob && !runtime_config_blob_found) {
-		if (Util::ends_with (entry_name, SharedConstants::RUNTIME_CONFIG_BLOB_NAME)) {
-			runtime_config_blob_mmap = md_mmap_apk_file (state.file_fd, state.data_offset, state.file_size, entry_name.get ());
-			store_mapped_runtime_config_data (runtime_config_blob_mmap, entry_name.get ());
-			return false;
-		}
-	}
+	// if (application_config.have_runtime_config_blob && !runtime_config_blob_found) {
+	// 	if (Util::ends_with (entry_name, SharedConstants::RUNTIME_CONFIG_BLOB_NAME)) {
+	// 		runtime_config_blob_mmap = md_mmap_apk_file (state.file_fd, state.data_offset, state.file_size, entry_name.get ());
+	// 		store_mapped_runtime_config_data (runtime_config_blob_mmap, entry_name.get ());
+	// 		return false;
+	// 	}
+	// }
 
 	// assemblies must be 16-byte or 4-byte aligned, or Bad Things happen
 	if (((state.data_offset & 0xf) != 0) || ((state.data_offset & 0x3) != 0)) {

src/native/monodroid/monodroid-glue.cc

@@ -714,14 +714,17 @@ MonodroidRuntime::create_domain (JNIEnv *env, jstring_array_wrapper &runtimeApks
 
 	gather_bundled_assemblies (runtimeApks, &user_assemblies_count, have_split_apks);
 
-	if (embeddedAssemblies.have_runtime_config_blob ()) {
+	//	if (embeddedAssemblies.have_runtime_config_blob ()) {
+	if (embedded_runtime_config_size > 0) {
 		size_t blob_time_index;
 		if (FastTiming::enabled ()) [[unlikely]] {
 			blob_time_index = internal_timing->start_event (TimingEventKind::RuntimeConfigBlob);
 		}
 
 		runtime_config_args.kind = 1;
-		embeddedAssemblies.get_runtime_config_blob (runtime_config_args.runtimeconfig.data.data, runtime_config_args.runtimeconfig.data.data_len);
+//		embeddedAssemblies.get_runtime_config_blob (runtime_config_args.runtimeconfig.data.data, runtime_config_args.runtimeconfig.data.data_len);
+		runtime_config_args.runtimeconfig.data.data = reinterpret_cast<const char*>(embedded_runtime_config);
+		runtime_config_args.runtimeconfig.data.data_len = static_cast<uint32_t>(embedded_runtime_config_size);
 		monovm_runtimeconfig_initialize (&runtime_config_args, cleanup_runtime_config, nullptr);
 
 		if (FastTiming::enabled ()) [[unlikely]] {
@@ -1381,10 +1384,10 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 
 	Logger::init_logging_categories (mono_log_mask_raw, mono_log_level_raw);
 
-	log_warn (LOG_DEFAULT, "Embedded runtime config size: %zu", embedded_runtime_config_size);
-	if (embedded_runtime_config_size > 0) {
-		log_warn (LOG_DEFAULT, "First byte of embedded runtime config: 0x%x", embedded_runtime_config[0]);
-	}
+	// log_warn (LOG_DEFAULT, "Embedded runtime config size: %zu", embedded_runtime_config_size);
+	// if (embedded_runtime_config_size > 0) {
+	// 	log_warn (LOG_DEFAULT, "First byte of embedded runtime config: 0x%x", embedded_runtime_config[0]);
+	// }
 
 	std::unique_ptr<char[]> mono_log_mask (mono_log_mask_raw);
 	std::unique_ptr<char[]> mono_log_level (mono_log_level_raw);

src/native/runtime-base/android-system.cc

@@ -741,10 +741,12 @@ AndroidSystem::setup_apk_directories (unsigned short running_on_cpu, jstring_arr
 
 		if (have_split_apks) {
 			if (Util::ends_with (apk, SharedConstants::split_config_abi_apk_name)) {
+				log_warn (LOG_ASSEMBLY, "Here #1");
 				add_apk_libdir (apk, number_of_added_directories, abi);
 				break;
 			}
 		} else {
+			log_warn (LOG_ASSEMBLY, "Here #2");
 			add_apk_libdir (apk, number_of_added_directories, abi);
 		}
 	}