Skip to content

Commit a7d5d54

Browse files
grendellogrendello
committed
Move MonoVM runtime to a subdirectory
1 parent 70a4f93 commit a7d5d54

104 files changed

Lines changed: 14 additions & 14 deletions

File tree

Some content is hidden

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

‎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

‎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

src/native/archive-dso-stub/CMakeLists.txt renamed to src/native/common/archive-dso-stub/CMakeLists.txt

File renamed without changes.

src/native/archive-dso-stub/stub.cc renamed to src/native/common/archive-dso-stub/stub.cc

File renamed without changes.

src/native/java-interop/CMakeLists.txt renamed to src/native/common/java-interop/CMakeLists.txt

File renamed without changes.

src/native/libstub/CMakeLists.txt renamed to src/native/common/libstub/CMakeLists.txt

File renamed without changes.

src/native/libstub/stub.cc renamed to src/native/common/libstub/stub.cc

File renamed without changes.

src/native/libunwind/CMakeLists.txt renamed to src/native/common/libunwind/CMakeLists.txt

File renamed without changes.

src/native/libunwind/config.h.in renamed to src/native/common/libunwind/config.h.in

File renamed without changes.

src/native/libunwind/fixes/aarch64/Gos-linux.c renamed to src/native/common/libunwind/fixes/aarch64/Gos-linux.c

File renamed without changes.

0 commit comments

Comments
 (0)