Move MonoVM runtime to a subdirectory

.gdn/policheck/source.gdnsuppress

@@ -8,33 +8,11 @@
   "suppressionSets": {
     "default": {
       "name": "default",
-      "createdDate": "2023-02-22 23:55:29Z",
-      "lastUpdatedDate": "2024-04-22 13:40:30Z"
+      "createdDate": "2025-02-05 11:48:04Z",
+      "lastUpdatedDate": "2025-02-05 11:48:04Z"
     }
   },
   "results": {
-    "6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292": {
-      "signature": "6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292",
-      "alternativeSignatures": [
-        "b5041e3ec6776af49d6d69148e4db480f366b559299d19ec8ea3e095295b39a8"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "justification": "Reference to an ISCII term.",
-      "createdDate": "2023-02-22 23:55:29Z"
-    },
-    "bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f": {
-      "signature": "bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f",
-      "alternativeSignatures": [
-        "739cb5e6ee2409515900652ca668f819f697f23834becece8d2f9f9236723c1b"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "justification": "Reference to an ISCII term.",
-      "createdDate": "2023-02-22 23:55:29Z"
-    },
     "db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789": {
       "signature": "db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789",
       "alternativeSignatures": [
@@ -101,71 +79,60 @@
       "justification": "Reference to an Android logging function.",
       "createdDate": "2023-02-22 23:55:29Z"
     },
-    "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10": {
-      "signature": "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10",
-      "alternativeSignatures": [
-        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "justification": "Reference to find first set bit function.",
-      "createdDate": "2023-02-22 23:55:29Z"
-    },
-    "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae": {
-      "signature": "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae",
+    "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b": {
+      "signature": "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b",
       "alternativeSignatures": [
-        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
+        "3901d031f3ac168bb1a84d06bb234355af514c59a0ed9da325b11a8861ff0b05"
       ],
       "memberOf": [
         "default"
       ],
-      "justification": "Reference to find first set bit function.",
-      "createdDate": "2023-02-22 23:55:29Z"
+      "justification": "Matching against `aapt2` tool output.",
+      "createdDate": "2025-02-05 11:48:04Z"
     },
-    "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354": {
-      "signature": "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354",
+    "a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45": {
+      "signature": "a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45",
       "alternativeSignatures": [
-        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
+        "c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
       ],
       "memberOf": [
         "default"
       ],
-      "justification": "Reference to find first set bit function.",
-      "createdDate": "2023-02-22 23:55:29Z"
+      "justification": "Reference to ffs(3) find first set bit function.",
+      "createdDate": "2025-02-05 11:48:04Z"
     },
-    "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45": {
-      "signature": "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45",
+    "fd1572e08e818076a2ceaab7a032186f70236fb82ab3663756d69632a9615329": {
+      "signature": "fd1572e08e818076a2ceaab7a032186f70236fb82ab3663756d69632a9615329",
       "alternativeSignatures": [
-        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
+        "c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
       ],
       "memberOf": [
         "default"
       ],
-      "justification": "Reference to find first set bit function.",
-      "createdDate": "2024-02-22 21:40:38Z"
+      "justification": "Reference to ffs(3) find first set bit function.",
+      "createdDate": "2025-02-05 11:48:04Z"
     },
-    "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b": {
-      "signature": "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b",
+    "2593da2393fe547b441ddfdfc614dd1448add1bf7d7ccc0696ab91f75fa6f29b": {
+      "signature": "2593da2393fe547b441ddfdfc614dd1448add1bf7d7ccc0696ab91f75fa6f29b",
       "alternativeSignatures": [
-        "3901d031f3ac168bb1a84d06bb234355af514c59a0ed9da325b11a8861ff0b05"
+        "c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
       ],
       "memberOf": [
         "default"
       ],
-      "justification": "Reference to output from an external tool.",
-      "createdDate": "2023-02-22 23:55:29Z"
+      "justification": "Reference to ffs(3) find first set bit function.",
+      "createdDate": "2025-02-05 11:48:04Z"
     },
-    "243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e": {
-      "signature": "243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e",
+    "1b604a2a60556cfca51c34a0e8d5f89174379ea1fc2598170147a7ce57a25fba": {
+      "signature": "1b604a2a60556cfca51c34a0e8d5f89174379ea1fc2598170147a7ce57a25fba",
       "alternativeSignatures": [
-        "cf02f44873b25336e01a1fa294bd858d2ea69ae734f08c6db40d4b83d17ccf76"
+        "c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
       ],
       "memberOf": [
         "default"
       ],
-      "justification": "Reference to a proper name.",
-      "createdDate": "2023-10-26 21:20:54Z"
+      "justification": "Reference to ffs(3) find first set bit function.",
+      "createdDate": "2025-02-05 11:48:04Z"
     }
   }
 }

Xamarin.Android.sln

@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Diagnost
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Cecil", "external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj", "{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "native", "src\native\native.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "native", "src\native\native-mono.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}"
 EndProject

build-tools/scripts/generate-pinvoke-tables.sh

@@ -2,7 +2,7 @@
 MY_DIR="$(dirname $0)"
 HOST="$(uname | tr A-Z a-z)"
 
-NATIVE_DIR="${MY_DIR}/../../src/native"
+NATIVE_DIR="${MY_DIR}/../../src/native/mono"
 MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
 GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
 GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"

src/native/CMakeLists.txt

@@ -480,23 +480,23 @@ macro(set_static_library_suffix TARGET_NAME)
 endmacro()
 
 if(BUILD_ARCHIVE_DSO_STUB)
-  add_subdirectory(archive-dso-stub)
+  add_subdirectory(common/archive-dso-stub)
 else()
-  add_subdirectory(libunwind)
-  add_subdirectory(lz4)
-  add_subdirectory(libstub)
-  add_subdirectory(shared)
-  add_subdirectory(java-interop)
-  add_subdirectory(xamarin-app-stub)
-  add_subdirectory(runtime-base)
-  add_subdirectory(tracing)
-  add_subdirectory(pinvoke-override)
+  add_subdirectory(common/libunwind)
+  add_subdirectory(common/lz4)
+  add_subdirectory(common/libstub)
+  add_subdirectory(mono/shared)
+  add_subdirectory(common/java-interop)
+  add_subdirectory(mono/xamarin-app-stub)
+  add_subdirectory(mono/runtime-base)
+  add_subdirectory(mono/tracing)
+  add_subdirectory(mono/pinvoke-override)
 
   if(DEBUG_BUILD)
-    add_subdirectory(xamarin-debug-app-helper)
+    add_subdirectory(mono/xamarin-debug-app-helper)
   endif()
 
-  add_subdirectory(monodroid)
+  add_subdirectory(mono/monodroid)
 
   add_custom_target(run_static_analysis
     COMMAND ${ANDROID_TOOLCHAIN_ROOT}/bin/clang-check -analyze -p="${CMAKE_CURRENT_BINARY_DIR}" ${CLANG_CHECK_SOURCES} > ${CMAKE_SOURCE_DIR}/static-analysis.${ANDROID_ABI}.${CMAKE_BUILD_TYPE}.txt 2>&1

src/native/monodroid/CMakeLists.txt → src/native/mono/monodroid/CMakeLists.txt

@@ -245,7 +245,7 @@ xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})
 
 target_link_options(${XAMARIN_MONO_ANDROID_LIB}
   PRIVATE
-  -Wl,--version-script,${CMAKE_SOURCE_DIR}/libmono-android.map.txt
+  -Wl,--version-script,${CMAKE_SOURCE_DIR}/mono/libmono-android.map.txt
   -Wl,--no-undefined-version
 )