Cleanup

Author: grendello

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -311,6 +311,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' And '$(EmbedAssembliesIntoApk)' == 'False' ">True</_AndroidFastDeployEnvironmentFiles>
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' ">False</_AndroidFastDeployEnvironmentFiles>
+
   <_AndroidCompressedAssembliesDir>$(IntermediateOutputPath)android\lz4</_AndroidCompressedAssembliesDir>
 </PropertyGroup>
 
@@ -2067,7 +2068,7 @@ because xbuild doesn't support framework reference assemblies.
 <PropertyGroup>
 	<_CompileToDalvikDependsOnTargets>
 		_CompileJava;
-    _RemoveRegisterAttribute;
+		_RemoveRegisterAttribute;
 		_CreateApplicationSharedLibraries;
 		_GetMonoPlatformJarPath;
 		_GetLibraryImports;
@@ -2371,7 +2372,6 @@ because xbuild doesn't support framework reference assemblies.
     ProjectFullPath="$(MSBuildProjectFullPath)"
     IncludeWrapSh="$(AndroidIncludeWrapSh)"
     CheckedBuild="$(_AndroidCheckedBuild)"
-    RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
     ExcludeFiles="@(AndroidPackagingOptionsExclude)"
     IncludeFiles="@(AndroidPackagingOptionsInclude)"
     ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
@@ -2448,6 +2448,10 @@ because xbuild doesn't support framework reference assemblies.
       SupportedAbis="@(_BuildTargetAbis)"
       IncludeWrapSh="$(AndroidIncludeWrapSh)"
       CheckedBuild="$(_AndroidCheckedBuild)"
+      ExcludeFiles="@(AndroidPackagingOptionsExclude)"
+      IncludeFiles="@(AndroidPackagingOptionsInclude)"
+      ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
+      ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
       ZipAlignmentPages="$(AndroidZipAlignment)"
       AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
       IntermediateOutputPath="$(IntermediateOutputPath)"
@@ -2520,7 +2524,6 @@ because xbuild doesn't support framework reference assemblies.
 			ProjectFullPath="$(MSBuildProjectFullPath)"
 			IncludeWrapSh="$(AndroidIncludeWrapSh)"
 			CheckedBuild="$(_AndroidCheckedBuild)"
-			RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
 			ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
 			ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
 			ExcludeFiles="@(AndroidPackagingOptionsExclude)"
@@ -2561,7 +2564,6 @@ because xbuild doesn't support framework reference assemblies.
 			ProjectFullPath="$(MSBuildProjectFullPath)"
 			IncludeWrapSh="$(AndroidIncludeWrapSh)"
 			CheckedBuild="$(_AndroidCheckedBuild)"
-			RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
 			ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
 			ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
 			ExcludeFiles="@(AndroidPackagingOptionsExclude)"

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

@@ -62,14 +62,6 @@ EmbeddedAssemblies::zip_load_entry_common (size_t entry_index, std::span<uint8_t
 		}
 	}
 
-	// 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)) {
 		Helpers::abort_application (
@@ -274,7 +266,6 @@ EmbeddedAssemblies::zip_load_assembly_store_entries (std::span<uint8_t> const& b
 	dynamic_local_string<SENSIBLE_PATH_MAX> entry_name;
 	bool assembly_store_found = embedded_assembly_store_size != 0;
 	if (assembly_store_found) {
-		log_debug (LOG_ASSEMBLY, "Got embedded assembly store, size %zu", embedded_assembly_store_size);
 		verify_assembly_store_and_set_info (embedded_assembly_store, "embedded");
 		log_debug (LOG_ASSEMBLY, "Looking for DSOs in APK");
 	} else {
@@ -399,8 +390,6 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, [[maybe_unus
 	} else {
 		zip_load_individual_assembly_entries (buf, cd_entries, should_register, state);
 	}
-
-	//delete[] raw_data;
 }
 
 template<bool NeedsNameAlloc>

src/native/mono/monodroid/embedded-assemblies.hh

@@ -194,12 +194,7 @@ namespace xamarin::android::internal {
 			runtime_config_data_size = 0uz;
 		}
 
-		static bool have_runtime_config_blob () noexcept
-		{
-			return application_config.have_runtime_config_blob && runtime_config_blob_mmap.area != nullptr;
-		}
-
-		static bool keep_scanning () noexcept
+		bool keep_scanning () const noexcept
 		{
 			return need_to_scan_more_apks;
 		}

src/native/mono/monodroid/monodroid-glue.cc

@@ -728,15 +728,13 @@ 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 (embedded_runtime_config_size > 0) {
 		size_t blob_time_index;
 		if (FastTiming::enabled ()) [[unlikely]] {
 			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);
 		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);
@@ -1410,11 +1408,6 @@ 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]);
-	// }
-
 	std::unique_ptr<char[]> mono_log_mask (mono_log_mask_raw);
 	std::unique_ptr<char[]> mono_log_level (mono_log_level_raw);