[Android] Support static linking of CoreCLR on Android

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

@@ -176,15 +176,23 @@ if (CLR_CMAKE_TARGET_OSX)
     find_library(FOUNDATION Foundation REQUIRED)
 endif()
 
-target_sources(coreclr PUBLIC $<TARGET_OBJECTS:cee_wks_core>)
-target_link_libraries(coreclr PUBLIC ${CORECLR_LIBRARIES} ${CLRJIT_STATIC} cee_wks ${FOUNDATION})
-target_sources(coreclr_static PUBLIC $<TARGET_OBJECTS:cee_wks_core>)
-target_link_libraries(coreclr_static PUBLIC ${CORECLR_LIBRARIES} clrjit_static cee_wks_mergeable ${FOUNDATION})
+target_link_libraries(coreclr PUBLIC ${CORECLR_LIBRARIES} ${CLRJIT_STATIC} cee_wks_core cee_wks ${FOUNDATION})
+target_link_libraries(coreclr_static PUBLIC ${CORECLR_LIBRARIES} cee_wks_core clrjit_static cee_wks_mergeable ${FOUNDATION})
 target_compile_definitions(coreclr_static PUBLIC CORECLR_EMBEDDED)
 
 if (CLR_CMAKE_HOST_ANDROID)
     target_link_libraries(coreclr PUBLIC log)
-    target_link_libraries(coreclr_static PUBLIC log)
+    target_link_libraries(coreclr_static
+        PUBLIC
+        coreclrminipal_objects
+        coreclrpal_objects
+        eventprovider_objects
+        gcinfo
+        libunwind
+        log
+        minipal_objects
+        nativeresourcestring_objects
+    )
 endif()
 
 if(CLR_CMAKE_TARGET_WIN32)
@@ -220,9 +228,9 @@ 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 OR CLR_CMAKE_HOST_TVOS)
+if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_ANDROID)
     install_clr(TARGETS coreclr_static DESTINATIONS . sharedFramework COMPONENT runtime)
-endif()
+endif(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_ANDROID)
 
 # Enable profile guided optimization
 add_pgo(coreclr)

src/coreclr/gc/unix/CMakeLists.txt

@@ -10,4 +10,4 @@ set(GC_PAL_SOURCES
     events.cpp
     cgroup.cpp)
 
-add_library(gc_pal STATIC ${GC_PAL_SOURCES} ${VERSION_FILE_PATH})
+add_library(gc_pal OBJECT ${GC_PAL_SOURCES} ${VERSION_FILE_PATH})

src/coreclr/gc/vxsort/CMakeLists.txt

@@ -26,4 +26,4 @@ set (VXSORT_SOURCES
   do_vxsort.h
 )
 
-add_library(gc_vxsort STATIC ${VXSORT_SOURCES})
+add_library(gc_vxsort OBJECT ${VXSORT_SOURCES})

src/coreclr/minipal/Unix/CMakeLists.txt

@@ -3,9 +3,14 @@ set(SOURCES
     dn-u16.cpp
 )
 
+add_library(coreclrminipal_objects
+    OBJECT
+    ${SOURCES}
+)
+
 add_library(coreclrminipal
     STATIC
-    ${SOURCES}
+    $<TARGET_OBJECTS:coreclrminipal_objects>
 )
 
 target_link_libraries(coreclrminipal PRIVATE minipal)

src/coreclr/nativeresources/CMakeLists.txt

@@ -1,8 +1,13 @@
 project(nativeresourcestring)
 
+add_library_clr(nativeresourcestring_objects
+  OBJECT
+  resourcestring.cpp
+)
+
 add_library_clr(nativeresourcestring
   STATIC
-  resourcestring.cpp
+  $<TARGET_OBJECTS:nativeresourcestring_objects>
 )
 
 install_clr (TARGETS nativeresourcestring DESTINATIONS lib)

src/coreclr/pal/src/CMakeLists.txt

@@ -224,11 +224,15 @@ if(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
   set(LIBUNWIND_OBJECTS $<TARGET_OBJECTS:libunwind>)
 endif(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 
-add_library(coreclrpal
-  STATIC
+add_library(coreclrpal_objects
+  OBJECT
   ${SOURCES}
   ${ARCH_SOURCES}
   ${PLATFORM_SOURCES}
+)
+
+add_library(coreclrpal STATIC
+  $<TARGET_OBJECTS:coreclrpal_objects>
   ${LIBUNWIND_OBJECTS}
 )
 

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

@@ -31,9 +31,14 @@ add_custom_command(OUTPUT ${DUMMY_PROVIDER_SOURCES}
   COMMAND ${GENERATE_COMMAND}
   DEPENDS ${EVENT_MANIFEST} ${GENERATE_SCRIPT})
 
+add_library(eventprovider_objects
+    OBJECT
+    ${DUMMY_PROVIDER_SOURCES}
+)
+
 add_library(eventprovider
     STATIC
-    ${DUMMY_PROVIDER_SOURCES}
+    $<TARGET_OBJECTS:eventprovider_objects>
 )
 
 set_target_properties(eventprovider PROPERTIES LINKER_LANGUAGE CXX)

src/libraries/tests.proj

@@ -780,6 +780,8 @@
   <ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'android' and '$(RuntimeFlavor)' == 'CoreCLR'">
     <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\JIT\Android.Device_Emulator.JIT.Test.csproj"
       BuildInParallel="false" />
+    <ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\JIT\Android.Device_Emulator.JIT.Static.Test.csproj"
+      BuildInParallel="false" />
   </ItemGroup>
 
   <Target Name="GenerateMergedCoverageReport"

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

@@ -14,6 +14,8 @@
     <_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 +43,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/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,6 +258,10 @@ public ApkBuilder(TaskLoggingHelper logger)
             {
                 runtimeLib = Path.Combine(AppDir, "libmonosgen-2.0.so");
             }
+            else if (StaticLinkedRuntime && IsCoreCLR)
+            {
+                runtimeLib = Path.Combine(AppDir, "libcoreclr_static.a");
+            }
             else if (IsCoreCLR)
             {
                 runtimeLib = Path.Combine(AppDir, "libcoreclr.so");
@@ -277,7 +276,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,12 +312,35 @@ 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)
         {
             extraLinkerArgs.AppendLine($"    \"{item.ItemSpec}\"");
         }
 
+        if (StaticLinkedRuntime && IsCoreCLR)
+        {
+            // Ensure global symbol references in the shared library are resolved to definitions in
+            // the same shared library. For the static linked runtime specifically, we need this for
+            // global functions in assembly for the linker to treat relative offsets to them as constant
+            extraLinkerArgs.AppendLine($"    \"-Wl,-Bsymbolic\"");
+        }
+
         nativeLibraries += assemblerFilesToLink.ToString();
 
         string aotSources = assemblerFiles.ToString();
@@ -401,7 +423,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)
@@ -458,7 +481,8 @@ 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%/

src/tasks/AndroidAppBuilder/Templates/monodroid-coreclr.c

@@ -157,7 +157,7 @@ free_resources ()
     }
     if (g_executable_path)
     {
-        free (g_executable_path);
+        free ((void*)g_executable_path);
         g_executable_path = NULL;
     }
     if (g_coreclr_handle)

src/tests/FunctionalTests/Android/Device_Emulator/JIT/Android.Device_Emulator.JIT.Static.Test.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RunAOTCompilation>false</RunAOTCompilation>
+    <TestRuntime>true</TestRuntime>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <MainLibraryFileName>Android.Device_Emulator.JIT.Static.Test.dll</MainLibraryFileName>
+    <ExpectedExitCode>42</ExpectedExitCode>
+    <StaticLinkedRuntime>true</StaticLinkedRuntime>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+</Project>