[Android] Support static linking of CoreCLR on Android

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

@@ -229,7 +229,7 @@ endif(CLR_CMAKE_TARGET_WIN32)
 
 # add the install targets
 install_clr(TARGETS coreclr DESTINATIONS . sharedFramework COMPONENT runtime)
-if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS)
+if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_ANDROID)
     install_clr(TARGETS coreclr_static DESTINATIONS . sharedFramework COMPONENT runtime)
 endif()
 

src/coreclr/gc/unix/CMakeLists.txt

@@ -11,3 +11,7 @@ set(GC_PAL_SOURCES
     cgroup.cpp)
 
 add_library(gc_pal STATIC ${GC_PAL_SOURCES} ${VERSION_FILE_PATH})
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install_clr(TARGETS gc_pal DESTINATIONS . sharedFramework)
+endif()

src/coreclr/minipal/Unix/CMakeLists.txt

@@ -9,3 +9,7 @@ add_library(coreclrminipal
 )
 
 target_link_libraries(coreclrminipal PRIVATE minipal)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install_clr(TARGETS coreclrminipal DESTINATIONS . sharedFramework)
+endif()

src/coreclr/nativeresources/CMakeLists.txt

@@ -6,3 +6,7 @@ add_library_clr(nativeresourcestring
 )
 
 install_clr (TARGETS nativeresourcestring DESTINATIONS lib)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install_clr(TARGETS nativeresourcestring DESTINATIONS . sharedFramework)
+endif()

src/coreclr/pal/src/CMakeLists.txt

@@ -361,3 +361,6 @@ endif(FEATURE_EVENT_TRACE)
 
 # Install the static PAL library for VS
 install_clr (TARGETS coreclrpal DESTINATIONS lib)
+if(CLR_CMAKE_HOST_ANDROID)
+    install_clr(TARGETS coreclrpal DESTINATIONS . sharedFramework)
+endif()

src/coreclr/pal/src/eventprovider/dummyprovider/CMakeLists.txt

@@ -40,3 +40,7 @@ set_target_properties(eventprovider PROPERTIES LINKER_LANGUAGE CXX)
 
 # Install the static eventprovider library
 install(TARGETS eventprovider DESTINATION lib)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install_clr(TARGETS eventprovider DESTINATIONS . sharedFramework)
+endif()

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

@@ -102,6 +102,12 @@
     <PlatformManifestFileEntry Include="libcoreclr.so" IsNative="true" />
     <PlatformManifestFileEntry Include="libcoreclr.dylib" IsNative="true" />
     <PlatformManifestFileEntry Include="libcoreclr_static.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libcoreclrminipal.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libcoreclrpal.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libeventprovider.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libgc_pal.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libnativeresourcestring.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libminipal.a" IsNative="true" />
     <PlatformManifestFileEntry Include="clrgc.dll" IsNative="true" />
     <PlatformManifestFileEntry Include="libclrgc.so" IsNative="true" />
     <PlatformManifestFileEntry Include="libclrgc.dylib" IsNative="true" />

src/mono/msbuild/android/build/AndroidBuild.props

@@ -10,10 +10,11 @@
     <_HostOS Condition="$([MSBuild]::IsOSPlatform('Windows'))">windows</_HostOS>
     <_HostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</_HostOS>
     <_HostOS Condition="'$(_HostOS)' == ''">linux</_HostOS>
-
     <_IsLibraryMode Condition="'$(UseMonoRuntime)' == 'true' and '$(UseNativeAOTRuntime)' != 'true' and '$(NativeLib)' != ''">true</_IsLibraryMode>
     <_ReadRuntimeComponentsManifestTargetName Condition="'$(UseMonoRuntime)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">_MonoReadAvailableComponentsManifest</_ReadRuntimeComponentsManifestTargetName>
 
+    <StaticLinkedRuntime Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(StaticLinkedRuntime)' == ''">false</StaticLinkedRuntime>
+
     <AndroidBuildAfterThisTarget Condition="'$(AndroidBuildAfterThisTarget)' == ''">Publish</AndroidBuildAfterThisTarget>
     <AndroidBuildDependsOn Condition="'$(UseMonoRuntime)' == 'true'">
         $(_ReadRuntimeComponentsManifestTargetName);
@@ -41,4 +42,4 @@
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' == 'true'" Project="$(_CommonTargetsDir)CommonMobileBuild.props" />
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' == 'true'" Project="$(_CommonTargetsDir)RuntimeComponentManifest.targets" />
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and ('$(UseMonoRuntime)' == 'true' and '$(RunAOTCompilation)' == 'true')" Project="$(_CommonTargetsDir)MonoAOTCompiler.props" />
-</Project>
+</Project>

src/mono/msbuild/android/build/AndroidBuild.targets

@@ -259,7 +259,8 @@
         ProjectName="$(AppName)"
         RuntimeComponents="@(RuntimeComponents)"
         RuntimeIdentifier="$(RuntimeIdentifier)"
-        StripDebugSymbols="$(StripDebugSymbols)">
+        StripDebugSymbols="$(StripDebugSymbols)"
+        StaticLinkedRuntime="$(StaticLinkedRuntime)">
         <Output TaskParameter="ApkBundlePath" PropertyName="ApkBundlePath" />
         <Output TaskParameter="ApkPackageId"  PropertyName="ApkPackageId" />
     </AndroidAppBuilderTask>

src/mono/sample/Android/Makefile

@@ -9,6 +9,7 @@ DEPLOY_AND_RUN?=true
 RUNTIME_FLAVOR?=mono
 R2R?=false
 R2R_COMPOSITE?=false
+STATIC_LINKING?=false
 
 #If DIAGNOSTIC_PORTS is enabled, @(RuntimeComponents) must also include 'diagnostics_tracing'.
 #If @(RuntimeComponents) includes 'diagnostics_tracing', DIAGNOSTIC_PORTS is optional.
@@ -57,7 +58,8 @@ run: appbuilder
 	/p:RuntimeFlavor=$(RUNTIME_FLAVOR) \
 	/p:PublishReadyToRun=$(R2R) \
 	/p:PublishReadyToRunComposite=$(R2R_COMPOSITE) \
+	/p:StaticLinkedRuntime=$(STATIC_LINKING) \
 	/bl
 clean:
 	rm -rf $(REPO_DIR)/artifacts/bin/AndroidSampleApp
-	rm -rf $(REPO_DIR)/artifacts/obj/mono/AndroidSampleApp
+	rm -rf $(REPO_DIR)/artifacts/obj/mono/AndroidSampleApp

src/native/minipal/CMakeLists.txt

@@ -46,3 +46,9 @@ add_library(minipal_sanitizer_support OBJECT
 # Exclude this target from the default build as we may not have sanitzer headers available
 # in a non-sanitized build.
 set_target_properties(minipal_sanitizer_support PROPERTIES EXCLUDE_FROM_ALL ON)
+
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install (TARGETS minipal DESTINATION .)
+endif()
+

src/tasks/AndroidAppBuilder/ApkBuilder.cs

@@ -120,11 +120,6 @@ public ApkBuilder(TaskLoggingHelper logger)
             throw new ArgumentException($"Using DiagnosticPorts targeting Mono requires diagnostics_tracing runtime component, which was not included in 'RuntimeComponents' item group. @RuntimeComponents: '{string.Join(", ", RuntimeComponents)}'");
         }
 
-        if (IsCoreCLR && StaticLinkedRuntime)
-        {
-            throw new ArgumentException("Static linking is not supported for CoreCLR runtime");
-        }
-
         AndroidSdkHelper androidSdkHelper = new AndroidSdkHelper(AndroidSdk, BuildApiLevel, BuildToolsVersion);
 
         if (string.IsNullOrEmpty(MinApiLevel))
@@ -263,7 +258,10 @@ public ApkBuilder(TaskLoggingHelper logger)
             {
                 runtimeLib = Path.Combine(AppDir, "libmonosgen-2.0.so");
             }
-            else if (IsCoreCLR)
+            else if (StaticLinkedRuntime && IsCoreCLR)
+            {
+                runtimeLib = Path.Combine(AppDir, "libcoreclr_static.a");
+            }else if (IsCoreCLR)
             {
                 runtimeLib = Path.Combine(AppDir, "libcoreclr.so");
             }
@@ -277,7 +275,7 @@ public ApkBuilder(TaskLoggingHelper logger)
                 nativeLibraries += $"{runtimeLib}{Environment.NewLine}";
             }
 
-            if (StaticLinkedRuntime)
+            if (StaticLinkedRuntime && IsMono)
             {
                 string[] staticComponentStubLibs = Directory.GetFiles(AppDir, "libmono-component-*-stub-static.a");
 
@@ -313,6 +311,21 @@ public ApkBuilder(TaskLoggingHelper logger)
             }
         }
 
+        if (StaticLinkedRuntime && IsCoreCLR)
+        {
+            string[] staticLibs = Directory.GetFiles(AppDir, "*.a")
+                .Where(lib => !Path.GetFileName(lib).Equals("libcoreclr_static.a", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
+
+            foreach (string lib in staticLibs)
+            {
+                nativeLibraries += $"    {lib}{Environment.NewLine}";
+            }
+
+            nativeLibraries += $"    libc++abi.a{Environment.NewLine}";
+            nativeLibraries += $"    libc++_static.a{Environment.NewLine}";
+        }
+
         StringBuilder extraLinkerArgs = new StringBuilder();
         foreach (ITaskItem item in ExtraLinkerArguments)
         {
@@ -401,7 +414,8 @@ public ApkBuilder(TaskLoggingHelper logger)
             envVariables += $"\t\tsetEnv(\"{name}\", \"{value}\");\n";
         }
 
-        string jniLibraryName = (IsLibraryMode) ? ProjectName! : "System.Security.Cryptography.Native.Android";
+        string jniLibraryName = (IsLibraryMode) ? ProjectName! :
+            (StaticLinkedRuntime && IsCoreCLR) ? "monodroid" : "System.Security.Cryptography.Native.Android";
         string monoRunner = Utils.GetEmbeddedResource("MonoRunner.java")
             .Replace("%EntryPointLibName%", Path.GetFileName(mainLibraryFileName))
             .Replace("%JNI_LIBRARY_NAME%", jniLibraryName)
@@ -461,7 +475,9 @@ public ApkBuilder(TaskLoggingHelper logger)
                     excludedLibs.Add("libmscordaccore.so");
                 }
             }
-            dynamicLibs.AddRange(Directory.GetFiles(AppDir, "*.so").Where(file => !excludedLibs.Contains(Path.GetFileName(file))));
+
+            if (!StaticLinkedRuntime)
+                dynamicLibs.AddRange(Directory.GetFiles(AppDir, "*.so").Where(file => !excludedLibs.Contains(Path.GetFileName(file))));
         }
 
         // add all *.so files to lib/%abi%/