Always generate embedded store sources in CreateEmbeddedAssemblyStore

Author: grendello

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets

@@ -13,14 +13,14 @@
   </Target>
 
   <Target Name="_CreateEmbeddedAssemblyStore"
-          Condition=" '$(_AndroidEmbedAssemblyStoreInRuntime)' == 'True' "
           DependsOnTargets="_PrepareCreateEmbeddedAssemblyStoreOutputItems"
           Inputs="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths);@(_ShrunkFrameworkAssemblies)"
           Outputs="@(_EmbeddedAssemblyStoreSourceFiles)">
     <CreateEmbeddedAssemblyStore
         AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
         AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
         AssemblySourcesDir="$(IntermediateOutputPath)android"
+        AssemblyStoreEmbeddedInRuntime="$(_AndroidEmbedAssemblyStoreInRuntime)"
         CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)\test\"
         Debug="$(AndroidIncludeDebugSymbols)"
         EnableCompression="$(AndroidEnableAssemblyCompression)"

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

@@ -25,6 +25,9 @@ public class CreateEmbeddedAssemblyStore : AndroidTask
 	[Required]
 	public string CompressedAssembliesDir { get; set; }
 
+	[Required]
+	public bool AssemblyStoreEmbeddedInRuntime { get; set; }
+
 	[Required]
 	public bool Debug { get; set; }
 
@@ -44,6 +47,28 @@ public class CreateEmbeddedAssemblyStore : AndroidTask
 	public string [] SupportedAbis { get; set; }
 
 	public override bool RunTask ()
+	{
+		if (AssemblyStoreEmbeddedInRuntime) {
+			return EmbedAssemblyStore ();
+		}
+
+		// Generate sources to satisfy libmonodroid's ABI requirements
+		foreach (string abi in SupportedAbis) {
+			ELFEmbeddingHelper.EmbedBinary (
+				Log,
+				abi,
+				AndroidBinUtilsDirectory,
+				inputFile: null,
+				ELFEmbeddingHelper.KnownEmbedItems.AssemblyStore,
+				AssemblySourcesDir,
+				missingContentOK: true
+			);
+		}
+
+		return !Log.HasLoggedErrors;
+	}
+
+	bool EmbedAssemblyStore ()
 	{
 		bool compress = !Debug && EnableCompression;
 		IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? compressedAssembliesInfo = null;

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

@@ -62,13 +62,10 @@ public override bool RunTask ()
 		[Required]
 		public bool EnablePreloadAssembliesDefault { get; set; }
 
-		// These two properties should be required but they will require modifying `monodroid` first
+		// This property should be required but it will require modifying `monodroid` first
 		//[Required]
 		public string AndroidBinUtilsDirectory { get; set; }
 
-		//[Required]
-		public bool AssemblyStoreEmbeddedInRuntime { get; set; }
-
 		public bool EnableMarshalMethods { get; set; }
 		public string RuntimeConfigBinFilePath { get; set; }
 		public string BoundExceptionType { get; set; }
@@ -352,7 +349,6 @@ 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

@@ -198,7 +198,6 @@ 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)
@@ -308,24 +307,6 @@ 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

@@ -1906,8 +1906,7 @@ because xbuild doesn't support framework reference assemblies.
     UseAssemblyStore="$(AndroidUseAssemblyStore)"
     EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
     CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
-    AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
-    AssemblyStoreEmbeddedInRuntime="$(_AndroidEmbedAssemblyStoreInRuntime)" />
+    AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)" />
   <Touch Files="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp" AlwaysCreate="True" />
   <ItemGroup>
     <FileWrites Include="@(_EnvironmentAssemblySource)" />