A handful of bugfixes and performance tweaks

Author: grendello

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

@@ -65,6 +65,9 @@ public override bool RunTask ()
 		[Required]
 		public string AndroidBinUtilsDirectory { get; set; }
 
+		[Required]
+		public bool AssemblyStoreEmbeddedInRuntime { get; set; }
+
 		[Output]
 		public ITaskItem[] EmbeddedObjectFiles { get; set; }
 
@@ -331,6 +334,7 @@ void AddEnvironment ()
 				JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
 				MarshalMethodsEnabled = EnableMarshalMethods,
 				IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
+				AssemblyStoreEmbeddedInRuntime = UseAssemblyStore && AssemblyStoreEmbeddedInRuntime,
 			};
 			LLVMIR.LlvmIrModule appConfigModule = appConfigAsmGen.Construct ();
 

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

@@ -197,6 +197,7 @@ sealed class XamarinAndroidBundledAssembly
 		public bool MarshalMethodsEnabled { get; set; }
 		public bool ManagedMarshalMethodsLookupEnabled { get; set; }
 		public bool IgnoreSplitConfigs { get; set; }
+		public bool AssemblyStoreEmbeddedInRuntime { get; set; }
 
 		public ApplicationConfigNativeAssemblyGenerator (IDictionary<string, string> environmentVariables, IDictionary<string, string> systemProperties, TaskLoggingHelper log)
 			: base (log)
@@ -306,6 +307,24 @@ protected override void Construct (LlvmIrModule module)
 			module.Add (bundled_assemblies);
 
 			AddAssemblyStores (module);
+
+			if (AssemblyStoreEmbeddedInRuntime) {
+				return;
+			}
+
+			// Need these to keep ABI compatibility with `libxamarin-app.so` used at the runtime's build time
+			var embedded_assembly_store_size = new LlvmIrGlobalVariable (
+				(ulong)0,
+				"embedded_assembly_store_size",
+				LlvmIrVariableOptions.GlobalConstant
+			);
+			module.Add (embedded_assembly_store_size);
+
+			var embedded_assembly_store = new LlvmIrGlobalVariable (typeof (byte[]), "embedded_assembly_store", LlvmIrVariableOptions.GlobalWritable) {
+				ZeroInitializeArray = true,
+				ArrayItemCount = 0,
+			};
+			module.Add (embedded_assembly_store);
 		}
 
 		void AddAssemblyStores (LlvmIrModule module)

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

@@ -361,6 +361,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False</_AndroidUseMarshalMethods>
   <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)</_AndroidUseMarshalMethods>
   <_AndroidEmbedAssemblyStoreInRuntime Condition=" '$(AndroidUseAssemblyStore)' == 'True' And '$(_AndroidEmbedAssemblyStoreInRuntime)' == '' ">True</_AndroidEmbedAssemblyStoreInRuntime>
+  <_AndroidEmbedAssemblyStoreInRuntime Condition="'$(_AndroidEmbedAssemblyStoreInRuntime)' == '' ">False</_AndroidEmbedAssemblyStoreInRuntime>
 </PropertyGroup>
 
 <!-- Do not resolve from the GAC under any circumstances in Mobile -->
@@ -1906,6 +1907,7 @@ because xbuild doesn't support framework reference assemblies.
     EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
     CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
     AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
+    AssemblyStoreEmbeddedInRuntime="$(_AndroidEmbedAssemblyStoreInRuntime)"
   >
     <Output TaskParameter="EmbeddedObjectFiles" ItemName="_NativeAssemblyTarget" />
   </GeneratePackageManagerJava>

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

@@ -1159,8 +1159,8 @@ MonodroidRuntime::set_profile_options () noexcept
 			.append (OUTPUT_ARG)
 			.append (output_path.get (), output_path.length ());
 	}
-	if (Util::create_directory (AndroidSystem::override_dirs[0], 0) < 0) {
-		log_warn (LOG_DEFAULT, "Failed to create directory '{}'. {}", optional_string (AndroidSystem::override_dirs[0]), std::strerror (errno));
+	if (Util::create_directory (AndroidSystem::override_dirs[0], 0777, 000) < 0) {
+		log_warn (LOG_DEFAULT, "Failed to create directory '%s'. %s", AndroidSystem::override_dirs[0], std::strerror (errno));
 	}
 
 	log_warn (LOG_DEFAULT, "Initializing profiler with options: {}", optional_string (value.get ()));

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

@@ -262,26 +262,14 @@ AndroidSystem::monodroid_get_system_property_from_overrides ([[maybe_unused]] co
 	return 0;
 }
 
-// TODO: review this. Do we really have to create the dir in release?
 void
 AndroidSystem::create_update_dir (char *override_dir) noexcept
 {
-#if defined (RELEASE)
-	/*
-	 * Don't create .__override__ on Release builds, because Google requires
-	 * that pre-loaded apps not create world-writable directories.
-	 *
-	 * However, if any logging is enabled (which should _not_ happen with
-	 * pre-loaded apps!), we need the .__override__ directory...
-	 */
-	if (log_categories == 0 && monodroid_get_system_property (SharedConstants::DEBUG_MONO_PROFILE_PROPERTY, nullptr) == 0) {
-		return;
-	}
-#endif // def RELEASE
-
 	override_dirs [0] = override_dir;
+#if defined(DEBUG)
+	log_debug (LOG_DEFAULT, "Creating public update directory: `%s`", override_dir);
 	Util::create_public_directory (override_dir);
-	log_warn (LOG_DEFAULT, "Creating public update directory: `{}`", override_dir);
+#endif
 }
 
 bool

src/native/mono/runtime-base/util.cc

@@ -147,14 +147,14 @@ Util::path_combine (const char *path1, const char *path2)
 void
 Util::create_public_directory (const char *dir)
 {
-	int ret = create_directory (dir, 0777);
+	int ret = create_directory (dir, 0777, 0);
 	if (ret < 0) {
-		log_warn (LOG_DEFAULT, "Failed to create directory '{}'. {}", dir, std::strerror (errno));
+		log_warn (LOG_DEFAULT, "Failed to create public directory '%s'. %s", dir, std::strerror (errno));
 	}
 }
 
 int
-Util::create_directory (const char *pathname, mode_t mode)
+Util::create_directory (const char *pathname, mode_t mode, mode_t mask)
 {
 	if (mode <= 0)
 		mode = DEFAULT_DIRECTORY_MODE;
@@ -163,7 +163,7 @@ Util::create_directory (const char *pathname, mode_t mode)
 		errno = EINVAL;
 		return -1;
 	}
-	mode_t oldumask = umask (022);
+	mode_t oldumask = umask (mask);
 	std::unique_ptr<char> path {strdup_new (pathname)};
 	int rv, ret = 0;
 	for (char *d = path.get (); d != nullptr && *d; ++d) {

src/native/mono/runtime-base/util.hh

@@ -69,7 +69,7 @@ namespace xamarin::android
 		static char            *monodroid_strdup_vprintf (const char *format, va_list vargs);
 		static char*            path_combine (const char *path1, const char *path2);
 		static void             create_public_directory (const char *dir);
-		static int              create_directory (const char *pathname, mode_t mode);
+		static int              create_directory (const char *pathname, mode_t mode, mode_t mask = 022);
 		static void             set_world_accessable (const char *path);
 		static auto             set_world_accessible (int fd) noexcept -> bool;
 		static void             set_user_executable (const char *path);