Share more code between MonoVM and CoreCLR hosts

Author: grendello

src/native/CMakeLists.txt

@@ -235,6 +235,8 @@ if(IS_CLR_RUNTIME)
       ${RUNTIME_INCLUDE_DIR}
 	  )
   endmacro()
+else()
+  include_directories(mono)
 endif()
 
 #
@@ -262,6 +264,13 @@ macro(xa_add_compile_definitions TARGET)
       ${TARGET}
       PRIVATE
       TARGET_ANDROID
+      XA_HOST_CLR
+    )
+  else()
+    target_compile_definitions(
+      ${TARGET}
+      PRIVATE
+      XA_HOST_MONOVM
     )
   endif()
 endmacro()

src/native/clr/host/generate-pinvoke-tables.cc

@@ -26,7 +26,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "xxhash.hh"
+#include <shared/xxhash.hh>
 
 namespace fs = std::filesystem;
 using namespace xamarin::android;

src/native/clr/include/constants.hh

@@ -5,7 +5,7 @@
 
 #include <string_view>
 
-#include "shared/cpp-util.hh"
+#include <shared/cpp-util.hh>
 
 namespace xamarin::android {
 	class Constants

src/native/clr/include/host/host.hh

@@ -5,7 +5,7 @@
 #include <jni.h>
 #include <corehost/host_runtime_contract.h>
 
-#include "../runtime-base/jni-wrappers.hh"
+#include <runtime-base/jni-wrappers.hh>
 #include "../runtime-base/timing.hh"
 #include "../shared/log_types.hh"
 #include "managed-interface.hh"

src/native/clr/include/host/pinvoke-override.hh

@@ -28,7 +28,7 @@
 #endif
 
 #include "../runtime-base/monodroid-dl.hh"
-#include "../shared/xxhash.hh"
+#include <shared/xxhash.hh>
 
 namespace xamarin::android {
 	struct PinvokeEntry

src/native/clr/include/runtime-base/android-system.hh

@@ -9,8 +9,8 @@
 #include "../constants.hh"
 #include "../shared/log_types.hh"
 #include "../runtime-base/cpu-arch.hh"
-#include "jni-wrappers.hh"
-#include "strings.hh"
+#include <runtime-base/jni-wrappers.hh>
+#include <runtime-base/strings.hh>
 #include "util.hh"
 
 struct BundledProperty;

src/native/clr/include/runtime-base/jni-wrappers.hh

@@ -5,7 +5,7 @@
 #include <string_view>
 
 #include <shared/log_types.hh>
-#include "strings.hh"
+#include <runtime-base/strings.hh>
 
 namespace xamarin::android {
 	class Logger

src/native/clr/include/runtime-base/logger.hh

@@ -7,11 +7,11 @@
 
 #include <java-interop-dlfcn.h>
 
-#include "../shared/xxhash.hh"
+#include <shared/xxhash.hh>
 #include "../xamarin-app.hh"
 
 #include "android-system.hh"
-#include "search.hh"
+#include <runtime-base/search.hh>
 #include "startup-aware-lock.hh"
 
 namespace xamarin::android