Move MonoVM runtime to a subdirectory

Author: grendello

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

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/archive-dso-stub/CMakeLists.txt renamed to src/native/common/archive-dso-stub/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
 )