Skip to content

Commit b7e21ad

Browse files
authored
[native] Move MonoVM runtime to a subdirectory (#9749)
Context: #9572 #9572 is prototyping CoreCLR support, and as part of that it renamed e.g. `src/native/monodroid` to `src/native/mono/monodroid` -- "inserting" a "runtime" value underneath `src/native` -- so that CoreCLR code won't be intermingled with MonoVM code. Separate out these file moves into a separate PR, to reduce the size and review complexity of #9572.
1 parent 3a5736c commit b7e21ad

File tree

106 files changed

+42
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+42
-75
lines changed

.gdn/policheck/source.gdnsuppress

Lines changed: 27 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,11 @@
88
"suppressionSets": {
99
"default": {
1010
"name": "default",
11-
"createdDate": "2023-02-22 23:55:29Z",
12-
"lastUpdatedDate": "2024-04-22 13:40:30Z"
11+
"createdDate": "2025-02-05 11:48:04Z",
12+
"lastUpdatedDate": "2025-02-05 11:48:04Z"
1313
}
1414
},
1515
"results": {
16-
"6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292": {
17-
"signature": "6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292",
18-
"alternativeSignatures": [
19-
"b5041e3ec6776af49d6d69148e4db480f366b559299d19ec8ea3e095295b39a8"
20-
],
21-
"memberOf": [
22-
"default"
23-
],
24-
"justification": "Reference to an ISCII term.",
25-
"createdDate": "2023-02-22 23:55:29Z"
26-
},
27-
"bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f": {
28-
"signature": "bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f",
29-
"alternativeSignatures": [
30-
"739cb5e6ee2409515900652ca668f819f697f23834becece8d2f9f9236723c1b"
31-
],
32-
"memberOf": [
33-
"default"
34-
],
35-
"justification": "Reference to an ISCII term.",
36-
"createdDate": "2023-02-22 23:55:29Z"
37-
},
3816
"db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789": {
3917
"signature": "db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789",
4018
"alternativeSignatures": [
@@ -101,71 +79,60 @@
10179
"justification": "Reference to an Android logging function.",
10280
"createdDate": "2023-02-22 23:55:29Z"
10381
},
104-
"bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10": {
105-
"signature": "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10",
106-
"alternativeSignatures": [
107-
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
108-
],
109-
"memberOf": [
110-
"default"
111-
],
112-
"justification": "Reference to find first set bit function.",
113-
"createdDate": "2023-02-22 23:55:29Z"
114-
},
115-
"dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae": {
116-
"signature": "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae",
82+
"b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b": {
83+
"signature": "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b",
11784
"alternativeSignatures": [
118-
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
85+
"3901d031f3ac168bb1a84d06bb234355af514c59a0ed9da325b11a8861ff0b05"
11986
],
12087
"memberOf": [
12188
"default"
12289
],
123-
"justification": "Reference to find first set bit function.",
124-
"createdDate": "2023-02-22 23:55:29Z"
90+
"justification": "Matching against `aapt2` tool output.",
91+
"createdDate": "2025-02-05 11:48:04Z"
12592
},
126-
"eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354": {
127-
"signature": "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354",
93+
"a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45": {
94+
"signature": "a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45",
12895
"alternativeSignatures": [
129-
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
96+
"c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
13097
],
13198
"memberOf": [
13299
"default"
133100
],
134-
"justification": "Reference to find first set bit function.",
135-
"createdDate": "2023-02-22 23:55:29Z"
101+
"justification": "Reference to ffs(3) find first set bit function.",
102+
"createdDate": "2025-02-05 11:48:04Z"
136103
},
137-
"bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45": {
138-
"signature": "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45",
104+
"fd1572e08e818076a2ceaab7a032186f70236fb82ab3663756d69632a9615329": {
105+
"signature": "fd1572e08e818076a2ceaab7a032186f70236fb82ab3663756d69632a9615329",
139106
"alternativeSignatures": [
140-
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
107+
"c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
141108
],
142109
"memberOf": [
143110
"default"
144111
],
145-
"justification": "Reference to find first set bit function.",
146-
"createdDate": "2024-02-22 21:40:38Z"
112+
"justification": "Reference to ffs(3) find first set bit function.",
113+
"createdDate": "2025-02-05 11:48:04Z"
147114
},
148-
"b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b": {
149-
"signature": "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b",
115+
"2593da2393fe547b441ddfdfc614dd1448add1bf7d7ccc0696ab91f75fa6f29b": {
116+
"signature": "2593da2393fe547b441ddfdfc614dd1448add1bf7d7ccc0696ab91f75fa6f29b",
150117
"alternativeSignatures": [
151-
"3901d031f3ac168bb1a84d06bb234355af514c59a0ed9da325b11a8861ff0b05"
118+
"c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
152119
],
153120
"memberOf": [
154121
"default"
155122
],
156-
"justification": "Reference to output from an external tool.",
157-
"createdDate": "2023-02-22 23:55:29Z"
123+
"justification": "Reference to ffs(3) find first set bit function.",
124+
"createdDate": "2025-02-05 11:48:04Z"
158125
},
159-
"243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e": {
160-
"signature": "243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e",
126+
"1b604a2a60556cfca51c34a0e8d5f89174379ea1fc2598170147a7ce57a25fba": {
127+
"signature": "1b604a2a60556cfca51c34a0e8d5f89174379ea1fc2598170147a7ce57a25fba",
161128
"alternativeSignatures": [
162-
"cf02f44873b25336e01a1fa294bd858d2ea69ae734f08c6db40d4b83d17ccf76"
129+
"c5aa7148967f346e897301d8c424af20d89620c75ba9b966a0d42985102717bc"
163130
],
164131
"memberOf": [
165132
"default"
166133
],
167-
"justification": "Reference to a proper name.",
168-
"createdDate": "2023-10-26 21:20:54Z"
134+
"justification": "Reference to ffs(3) find first set bit function.",
135+
"createdDate": "2025-02-05 11:48:04Z"
169136
}
170137
}
171138
}

Xamarin.Android.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Diagnost
4545
EndProject
4646
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}"
4747
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "native", "src\native\native.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "native", "src\native\native-mono.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
4949
EndProject
5050
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}"
5151
EndProject

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
MY_DIR="$(dirname $0)"
33
HOST="$(uname | tr A-Z a-z)"
44

5-
NATIVE_DIR="${MY_DIR}/../../src/native"
5+
NATIVE_DIR="${MY_DIR}/../../src/native/mono"
66
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
77
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
88
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"

src/native/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -480,23 +480,23 @@ macro(set_static_library_suffix TARGET_NAME)
480480
endmacro()
481481

482482
if(BUILD_ARCHIVE_DSO_STUB)
483-
add_subdirectory(archive-dso-stub)
483+
add_subdirectory(common/archive-dso-stub)
484484
else()
485-
add_subdirectory(libunwind)
486-
add_subdirectory(lz4)
487-
add_subdirectory(libstub)
488-
add_subdirectory(shared)
489-
add_subdirectory(java-interop)
490-
add_subdirectory(xamarin-app-stub)
491-
add_subdirectory(runtime-base)
492-
add_subdirectory(tracing)
493-
add_subdirectory(pinvoke-override)
485+
add_subdirectory(common/libunwind)
486+
add_subdirectory(common/lz4)
487+
add_subdirectory(common/libstub)
488+
add_subdirectory(mono/shared)
489+
add_subdirectory(common/java-interop)
490+
add_subdirectory(mono/xamarin-app-stub)
491+
add_subdirectory(mono/runtime-base)
492+
add_subdirectory(mono/tracing)
493+
add_subdirectory(mono/pinvoke-override)
494494

495495
if(DEBUG_BUILD)
496-
add_subdirectory(xamarin-debug-app-helper)
496+
add_subdirectory(mono/xamarin-debug-app-helper)
497497
endif()
498498

499-
add_subdirectory(monodroid)
499+
add_subdirectory(mono/monodroid)
500500

501501
add_custom_target(run_static_analysis
502502
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
File renamed without changes.

0 commit comments

Comments
 (0)