libxamarin-app.so has it all now

Author: grendello

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

@@ -67,7 +67,6 @@ properties that determine build ordering.
       _GenerateEnvironmentFiles;
       _CompileJava;
       _CreateApplicationSharedLibraries;
-      _CreateAssemblySharedLibraries;
       _CompileDex;
       $(_AfterCompileDex);
       _CreateBaseApk;

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

@@ -57,7 +57,8 @@
     </PrepareAbiItems>
   </Target>
 
-  <Target Name="_PrepareAssemblySharedLibrariesSources">
+  <Target Name="_PrepareAssemblySharedLibrariesSources"
+          Condition=" '$(_AndroidUseAssemblySharedLibraries)' == 'true' ">
     <PrepareAbiItems
         BuildTargetAbis="@(_BuildTargetAbis)"
         NativeSourcesDir="$(_NativeAssemblySourceDir)"
@@ -100,14 +101,10 @@
       <_NativeAssemblyTarget Include="@(_AndroidRemapAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
         <abi>%(_AndroidRemapAssemblySource.abi)</abi>
       </_NativeAssemblyTarget>
-    </ItemGroup>
-  </Target>
 
-  <Target Name="_PrepareAssemblySharedLibrariesItems">
-    <ItemGroup>
-      <_NativeAssemblySharedLibrariesTarget Include="@(_AssemblyDSOSource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
+      <_NativeAssemblyTarget Include="@(_AssemblyDSOSource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
         <abi>%(_AssemblyDSOSource.abi)</abi>
-      </_NativeAssemblySharedLibrariesTarget>
+      </_NativeAssemblyTarget>
     </ItemGroup>
   </Target>
 
@@ -119,25 +116,16 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_PrepareAssemblySharedLibrariesItems">
-    <ItemGroup>
-      <_AssemblySharedLibrary Include="$(_AndroidApplicationSharedLibraryPath)%(_BuildTargetAbis.Identity)\libxamarin-assemblies.so">
-        <abi>%(_BuildTargetAbis.Identity)</abi>
-      </_AssemblySharedLibrary>
-    </ItemGroup>
-  </Target>
-
   <!-- Native source code generation targets -->
   <Target Name="_GenerateAssemblyDsoNativeSourceFiles"
-          DependsOnTargets="_PrepareAssemblySharedLibrariesItems"
           Condition=" '$(_AndroidUseAssemblySharedLibraries)' == 'true' "
-          Inputs="@(_ShrunkUserAssemblies);@(_ShrunkFrameworkAssemblies);@(_AndroidResolvedSatellitePaths)"
+          Inputs="@(_ResolvedUserAssemblies);@(_ResolvedFrameworkAssemblies);@(_AndroidResolvedSatellitePaths)"
           Outputs="@(_AssemblyDSOSource)">
     <GenerateAssemblyDsoNativeSourceFiles
         SourcesOutputDirectory="$(_NativeAssemblySourceDir)"
         CompressedAssembliesOutputDirectory="$(_CompressedAssembliesOutputDir)"
         SupportedAbis="@(_BuildTargetAbis)"
-        Assemblies="@(_ShrunkUserAssemblies);@(_ShrunkFrameworkAssemblies);@(_AndroidResolvedSatellitePaths)"
+        Assemblies="@(_ResolvedUserAssemblies);@(_ResolvedFrameworkAssemblies);@(_AndroidResolvedSatellitePaths)"
         EnableCompression="$(AndroidEnableAssemblyCompression)"
     />
   </Target>
@@ -182,11 +170,11 @@
 
   <!-- Native code compilation targets -->
   <Target Name="_CompileNativeAssemblySources"
-          DependsOnTargets="_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles"
-          Inputs="@(_TypeMapAssemblySource);@(_TypeMapAssemblyInclude);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource)"
+          DependsOnTargets="_PrepareAssemblySharedLibrariesSources;_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles;_GenerateAssemblyDsoNativeSourceFiles"
+          Inputs="@(_TypeMapAssemblySource);@(_TypeMapAssemblyInclude);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource);@(_AssemblyDSOSource)"
           Outputs="@(_NativeAssemblyTarget)">
     <CompileNativeAssembly
-        Sources="@(_TypeMapAssemblySource);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource)"
+        Sources="@(_TypeMapAssemblySource);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource);@(_AssemblyDSOSource)"
         DebugBuild="$(AndroidIncludeDebugSymbols)"
         WorkingDirectory="$(_NativeAssemblySourceDir)"
         AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
@@ -196,13 +184,6 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_CompileAssemblySharedLibrariesSources"
-          DependsOnTargets="_PrepareAssemblySharedLibrariesSources;_GenerateAssemblyDsoNativeSourceFiles"
-          Condition=" '$(_AndroidUseAssemblySharedLibraries)' == 'true' "
-          Inputs="@(_AssemblyDSOSource)"
-          Outputs="@(_NativeAssemblySharedLibrariesTarget)">
-  </Target>
-
   <!-- Shared library linking targets -->
   <Target Name="_CreateApplicationSharedLibraries"
           DependsOnTargets="_CompileNativeAssemblySources;_PrepareApplicationSharedLibraryItems"
@@ -218,20 +199,4 @@
       <FileWrites Include="@(_ApplicationSharedLibrary)" />
     </ItemGroup>
   </Target>
-
-  <Target Name="_CreateAssemblySharedLibraries"
-          DependsOnTargets="_CompileAssemblySharedLibrariesSources;_PrepareAssemblySharedLibrariesItems"
-          Condition=" '$(_AndroidUseAssemblySharedLibraries)' == 'true' "
-          Inputs="@(_NativeAssemblySharedLibrariesTarget)"
-          Outputs="@(_AssemblySharedLibrary)">
-    <LinkApplicationSharedLibraries
-        ObjectFiles="@(_NativeAssemblySharedLibrariesTarget)"
-        ApplicationSharedLibraries="@(_AssemblySharedLibrary)"
-        DebugBuild="$(AndroidIncludeDebugSymbols)"
-        AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
-    />
-    <ItemGroup>
-      <FileWrites Include="@(_AssemblySharedLibrary)" />
-    </ItemGroup>
-  </Target>
 </Project>

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

@@ -421,7 +421,7 @@ void WriteType (GeneratorWriteContext context, Type type, object? value, out Llv
 				Type elementType = type.GetArrayElementType ();
 				ulong elementCount = GetAggregateValueElementCount (context, type, value, globalVariable);
 
-				WriteArrayType (context, elementType, elementCount, out typeInfo);
+				WriteArrayType (context, elementType, elementCount, globalVariable, out typeInfo);
 				return;
 			}
 
@@ -437,6 +437,11 @@ void WriteType (GeneratorWriteContext context, Type type, object? value, out Llv
 		}
 
 		void WriteArrayType (GeneratorWriteContext context, Type elementType, ulong elementCount, out LlvmTypeInfo typeInfo)
+		{
+			WriteArrayType (context, elementType, elementCount, variable: null, out typeInfo);
+		}
+
+		void WriteArrayType (GeneratorWriteContext context, Type elementType, ulong elementCount, LlvmIrGlobalVariable? variable, out LlvmTypeInfo typeInfo)
 		{
 			string irType;
 			ulong size;
@@ -453,6 +458,35 @@ void WriteArrayType (GeneratorWriteContext context, Type elementType, ulong elem
 			} else {
 				irType = GetIRType (elementType, out size, out isPointer);
 				maxFieldAlignment = size;
+
+				if (elementType.IsArray) {
+					if (variable == null) {
+						throw new InvalidOperationException ($"Internal error: array of arrays ({elementType}) requires variable to be defined");
+					}
+
+					// For the sake of simpler code, we currently assume that all the element arrays are of the same size, because that's the only scenario
+					// that we use at this time.
+					var value = variable.Value as ICollection;
+					if (value == null) {
+						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value of type which implements the ICollection interface");
+					}
+
+					if (value.Count == 0) {
+						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value which is a non-empty ICollection");
+					}
+
+					Array? firstItem = null;
+					foreach (object v in value) {
+						firstItem = (Array)v;
+						break;
+					}
+
+					if (firstItem == null) {
+						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value which is a non-empty ICollection with non-null elements");
+					}
+
+					irType = $"[{MonoAndroidHelper.CultureInvariantToString (firstItem.Length)} x {irType}]";
+				}
 			}
 			typeInfo = new LlvmTypeInfo (
 				isPointer: isPointer,