[coreclr][android] Don't build/ship unused GC variants for Android (#114448)

* Do not build or ship standalone GC libs for coreclr android

* Do not build server GC into the coreCLR runtime lib on Android

* Properly guard server GC specific defines

* Remove unnecesarry exclusion

Author: ivanpovazan

src/coreclr/CMakeLists.txt

@@ -29,7 +29,7 @@ if(CORECLR_SET_RPATH)
     set(MACOSX_RPATH ON)
 endif(CORECLR_SET_RPATH)
 
-if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_BROWSER)
+if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_BROWSER OR CLR_CMAKE_HOST_ANDROID)
   set(FEATURE_STANDALONE_GC 0)
 endif()
 

src/coreclr/clrdefinitions.cmake

@@ -176,7 +176,9 @@ endif (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX)
 if (FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
   add_definitions(-DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
 endif(FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION)
-add_definitions(-DFEATURE_SVR_GC)
+if (NOT CLR_CMAKE_HOST_ANDROID)
+  add_definitions(-DFEATURE_SVR_GC)
+endif(NOT CLR_CMAKE_HOST_ANDROID)
 add_definitions(-DFEATURE_SYMDIFF)
 add_compile_definitions(FEATURE_TIERED_COMPILATION)
 if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_LOONGARCH64 OR CLR_CMAKE_TARGET_ARCH_RISCV64)

src/coreclr/vm/amd64/jitinterfaceamd64.cpp

@@ -709,7 +709,11 @@ bool WriteBarrierManager::NeedDifferentWriteBarrier(bool bReqUpperBoundsCheck, b
             }
             else
             {
+#ifdef FEATURE_SVR_GC
                 writeBarrierType = GCHeapUtilities::IsServerHeap() ? WRITE_BARRIER_SVR64 : WRITE_BARRIER_PREGROW64;
+#else
+                writeBarrierType = WRITE_BARRIER_PREGROW64;
+#endif // FEATURE_SVR_GC
             }
             continue;
 

src/tasks/AndroidAppBuilder/ApkBuilder.cs

@@ -451,9 +451,6 @@ public ApkBuilder(TaskLoggingHelper logger)
             var excludedLibs = new HashSet<string> { "libmonodroid.so" };
             if (IsCoreCLR)
             {
-                // exclude standalone GC libs
-                excludedLibs.Add("libclrgc.so");
-                excludedLibs.Add("libclrgcexp.so");
                 if (StripDebugSymbols)
                 {
                     // exclude debugger support libs