[Android] Include static native libraries in CoreCLR Android runtime pack (#115610)

* Add installation targets for native libraries in cmake files

* improve filtering logic in ApkBuilder

Author: kotlarmilos

src/native/libs/System.Globalization.Native/CMakeLists.txt

@@ -127,7 +127,7 @@ if (CLR_CMAKE_TARGET_APPLE)
 endif()
 
 # time zone names are filtered out of icu data for the browser and associated functionality is disabled
-if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS) 
+if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS)
     set(NATIVEGLOBALIZATION_SOURCES ${NATIVEGLOBALIZATION_SOURCES} pal_timeZoneInfo.c)
 endif()
 
@@ -192,6 +192,9 @@ if(CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_WASI)
 endif()
 
 install (TARGETS System.Globalization.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
+if(CLR_CMAKE_HOST_ANDROID)
+    install (TARGETS System.Globalization.Native-Static DESTINATION sharedFramework COMPONENT runtime)
+endif()
 
 if(NOT CLR_CMAKE_TARGET_WIN32 AND NOT CLR_CMAKE_TARGET_APPLE AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_LINUX_MUSL AND NOT CLR_CMAKE_TARGET_HAIKU)
     if (GEN_SHARED_LIB)

src/native/libs/System.IO.Compression.Native/CMakeLists.txt

@@ -210,3 +210,7 @@ else ()
 endif ()
 
 install (TARGETS System.IO.Compression.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install (TARGETS System.IO.Compression.Native-Static DESTINATION sharedFramework COMPONENT runtime)
+endif()

src/native/libs/System.Native/CMakeLists.txt

@@ -138,3 +138,7 @@ add_library(System.Native-Static
 set_target_properties(System.Native-Static PROPERTIES OUTPUT_NAME System.Native CLEAN_DIRECT_OUTPUT 1)
 
 install (TARGETS System.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install (TARGETS System.Native-Static DESTINATION sharedFramework COMPONENT runtime)
+endif()

src/native/libs/System.Security.Cryptography.Native.Android/CMakeLists.txt

@@ -57,3 +57,7 @@ if (GEN_SHARED_LIB)
 endif()
 
 install (TARGETS System.Security.Cryptography.Native.Android-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
+
+if(CLR_CMAKE_HOST_ANDROID)
+    install (TARGETS System.Security.Cryptography.Native.Android-Static DESTINATION sharedFramework COMPONENT runtime)
+endif()

src/tasks/AndroidAppBuilder/ApkBuilder.cs

@@ -310,21 +310,23 @@ public ApkBuilder(TaskLoggingHelper logger)
                 // due to circular dependency.
                 nativeLibraries += $"    {runtimeLib}{Environment.NewLine}";
             }
-        }
 
-        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)
+            if (StaticLinkedRuntime && IsCoreCLR)
             {
-                nativeLibraries += $"    {lib}{Environment.NewLine}";
-            }
+                string[] staticMonoStubs = Directory.GetFiles(AppDir, "libmono*.a");
+                string[] staticLibs = Directory.GetFiles(AppDir, "*.a")
+                    .Where(lib => !Path.GetFileName(lib).Equals("libcoreclr_static.a", StringComparison.OrdinalIgnoreCase) &&
+                                  !staticMonoStubs.Contains(lib, StringComparer.OrdinalIgnoreCase))
+                    .ToArray();
 
-            nativeLibraries += $"    libc++abi.a{Environment.NewLine}";
-            nativeLibraries += $"    libc++_static.a{Environment.NewLine}";
+                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();