Add logging to the naot android runtime

Linking seems to work, not tested yet

Author: grendello

src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs

@@ -8,11 +8,15 @@ static partial class JavaInteropRuntime
 {
 	static JniRuntime? runtime;
 
+	[DllImport("xa-internal-api")]
+	static extern int XA_Host_NativeAOT_JNI_OnLoad (IntPtr vm, IntPtr reserved);
+
 	[UnmanagedCallersOnly (EntryPoint="JNI_OnLoad")]
 	static int JNI_OnLoad (IntPtr vm, IntPtr reserved)
 	{
 		try {
 			AndroidLog.Print (AndroidLogLevel.Info, "JavaInteropRuntime", "JNI_OnLoad()");
+			XA_Host_NativeAOT_JNI_OnLoad (vm, reserved);
 			LogcatTextWriter.Init ();
 			return (int) JniVersion.v1_6;
 		}
@@ -64,4 +68,4 @@ static void init (IntPtr jnienv, IntPtr klass, IntPtr classLoader)
 		}
 		transition.Dispose ();
 	}
-}
+}

src/native/CMakeLists.txt

@@ -161,6 +161,14 @@ include("${XA_BUILD_DIR}/xa_build_configuration.cmake")
 #
 # Paths
 #
+macro(temp_configure_mono_runtime_dir)
+  # TEMPORARY: for now JI needs to build with MonoVM embedding APIs
+  set(TEMP_NETCORE_RUNTIME_DIR_ARM64  "${NETCORE_APP_RUNTIME_DIR_ARM64}")
+  set(TEMP_NETCORE_RUNTIME_DIR_ARM    "${NETCORE_APP_RUNTIME_DIR_ARM}")
+  set(TEMP_NETCORE_RUNTIME_DIR_X86_64 "${NETCORE_APP_RUNTIME_DIR_X86_64}")
+  set(TEMP_NETCORE_RUNTIME_DIR_X86    "${NETCORE_APP_RUNTIME_DIR_X86}")
+endmacro()
+
 if(IS_CLR_RUNTIME)
   if(LOCAL_CORECLR_PATH)
     set(CLR_PACKAGE_NAME_STEM "microsoft.netcore.app.runtime.android")
@@ -179,11 +187,9 @@ if(IS_CLR_RUNTIME)
     set(RUNTIME_DIR_X86    "${CORECLR_APP_RUNTIME_DIR_X86}")
   endif()
 
-  # TEMPORARY: for now JI needs to build with MonoVM embedding APIs
-  set(TEMP_NETCORE_RUNTIME_DIR_ARM64  "${NETCORE_APP_RUNTIME_DIR_ARM64}")
-  set(TEMP_NETCORE_RUNTIME_DIR_ARM    "${NETCORE_APP_RUNTIME_DIR_ARM}")
-  set(TEMP_NETCORE_RUNTIME_DIR_X86_64 "${NETCORE_APP_RUNTIME_DIR_X86_64}")
-  set(TEMP_NETCORE_RUNTIME_DIR_X86    "${NETCORE_APP_RUNTIME_DIR_X86}")
+  temp_configure_mono_runtime_dir()
+elseif(IS_NAOT_RUNTIME)
+  temp_configure_mono_runtime_dir()
 elseif(IS_MONO_RUNTIME)
   set(RUNTIME_DIR_ARM64  "${NETCORE_APP_RUNTIME_DIR_ARM64}")
   set(RUNTIME_DIR_ARM    "${NETCORE_APP_RUNTIME_DIR_ARM}")
@@ -262,13 +268,15 @@ if(IS_CLR_RUNTIME)
   endmacro()
 elseif(IS_NAOT_RUNTIME)
   set(XA_RUNTIME_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nativeaot/include)
+  set(CLR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/clr/include)
 
   macro(xa_add_include_directories TARGET)
      target_include_directories(
         ${TARGET}
         PRIVATE
         ${XA_RUNTIME_INCLUDE_DIR}
         ${RUNTIME_INCLUDE_DIR}
+        ${CLR_INCLUDE_DIR}
      )
   endmacro()
 else()
@@ -314,7 +322,7 @@ macro(xa_add_compile_definitions TARGET)
       ${TARGET}
       PRIVATE
       TARGET_ANDROID
-      XA_HOST_NAOT
+      XA_HOST_NATIVEAOT
     )
   else()
     target_compile_definitions(
@@ -637,8 +645,9 @@ endmacro()
 if(BUILD_ARCHIVE_DSO_STUB)
   add_subdirectory(common/archive-dso-stub)
 else()
+  add_subdirectory(common/java-interop)
+
   if (IS_MONO_RUNTIME OR IS_CLR_RUNTIME)
-    add_subdirectory(common/java-interop)
     add_subdirectory(common/libunwind)
     add_subdirectory(common/lz4)
     add_subdirectory(common/runtime-base)

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

@@ -13,11 +13,14 @@
 
 #include "../constants.hh"
 #include <shared/helpers.hh>
-#include "archive-dso-stub-config.hh"
 #include <runtime-base/jni-wrappers.hh>
 #include "logger.hh"
 #include <runtime-base/strings.hh>
 
+#if !defined(XA_HOST_NATIVEAOT)
+#include "archive-dso-stub-config.hh"
+#endif
+
 namespace xamarin::android {
 	namespace detail {
 		template<typename T>
@@ -218,6 +221,7 @@ namespace xamarin::android {
 			return file_info;
 		}
 
+#if !defined(XA_HOST_NATIVEAOT)
 		[[gnu::always_inline]]
 		static std::tuple<void*, size_t> get_wrapper_dso_payload_pointer_and_size (detail::mmap_info const& map_info, std::string_view const& file_name) noexcept
 		{
@@ -248,6 +252,7 @@ namespace xamarin::android {
 				payload_hdr.sh_size
 			};
 		}
+#endif // ndef XA_HOST_NATIVEAOT
 
 		static auto is_path_rooted (const char *path) noexcept -> bool
 		{

src/native/clr/runtime-base/CMakeLists.txt

@@ -51,6 +51,7 @@ set(LIB_ALIAS xa::runtime-base)
 
 set(XA_RUNTIME_BASE_SOURCES
   android-system.cc
+  android-system-shared.cc
   cpu-arch-detect.cc
   jni-remapping.cc
   logger.cc

src/native/clr/runtime-base/android-system-shared.cc

@@ -0,0 +1,51 @@
+#include <limits>
+#include <string_view>
+
+#include <runtime-base/android-system.hh>
+
+using namespace xamarin::android;
+
+using std::operator""sv;
+
+auto AndroidSystem::monodroid_get_system_property (std::string_view const& name, dynamic_local_property_string &value) noexcept -> int
+{
+	int len = monodroid__system_property_get (name, value.get (), value.size ());
+	if (len > 0) {
+		// Clumsy, but if we want direct writes to be fast, this is the price we pay
+		value.set_length_after_direct_write (static_cast<size_t>(len));
+		return len;
+	}
+
+	size_t plen;
+	const char *v = lookup_system_property (name, plen);
+	if (v == nullptr) {
+		return len;
+	}
+
+	value.assign (v, plen);
+	return Helpers::add_with_overflow_check<int> (plen, 0);
+}
+
+auto
+AndroidSystem::monodroid__system_property_get (std::string_view const& name, char *sp_value, size_t sp_value_len) noexcept -> int
+{
+	if (name.empty () || sp_value == nullptr) {
+		return -1;
+	}
+
+	char *buf = nullptr;
+	if (sp_value_len < Constants::PROPERTY_VALUE_BUFFER_LEN) {
+		size_t alloc_size = Helpers::add_with_overflow_check<size_t> (Constants::PROPERTY_VALUE_BUFFER_LEN, 1uz);
+		log_warn (LOG_DEFAULT, "Buffer to store system property may be too small, will copy only {} bytes", sp_value_len);
+		buf = new char [alloc_size];
+	}
+
+	int len = __system_property_get (name.data (), buf ? buf : sp_value);
+	if (buf != nullptr) {
+		strncpy (sp_value, buf, sp_value_len);
+		sp_value [sp_value_len] = '\0';
+		delete[] buf;
+	}
+
+	return len;
+}

src/native/clr/runtime-base/android-system.cc

@@ -312,49 +312,6 @@ AndroidSystem::lookup_system_property (std::string_view const& name, size_t &val
 	return nullptr;
 }
 
-auto
-AndroidSystem::monodroid__system_property_get (std::string_view const& name, char *sp_value, size_t sp_value_len) noexcept -> int
-{
-	if (name.empty () || sp_value == nullptr) {
-		return -1;
-	}
-
-	char *buf = nullptr;
-	if (sp_value_len < Constants::PROPERTY_VALUE_BUFFER_LEN) {
-		size_t alloc_size = Helpers::add_with_overflow_check<size_t> (Constants::PROPERTY_VALUE_BUFFER_LEN, 1uz);
-		log_warn (LOG_DEFAULT, "Buffer to store system property may be too small, will copy only {} bytes", sp_value_len);
-		buf = new char [alloc_size];
-	}
-
-	int len = __system_property_get (name.data (), buf ? buf : sp_value);
-	if (buf != nullptr) {
-		strncpy (sp_value, buf, sp_value_len);
-		sp_value [sp_value_len] = '\0';
-		delete[] buf;
-	}
-
-	return len;
-}
-
-auto AndroidSystem::monodroid_get_system_property (std::string_view const& name, dynamic_local_property_string &value) noexcept -> int
-{
-	int len = monodroid__system_property_get (name, value.get (), value.size ());
-	if (len > 0) {
-		// Clumsy, but if we want direct writes to be fast, this is the price we pay
-		value.set_length_after_direct_write (static_cast<size_t>(len));
-		return len;
-	}
-
-	size_t plen;
-	const char *v = lookup_system_property (name, plen);
-	if (v == nullptr) {
-		return len;
-	}
-
-	value.assign (v, plen);
-	return Helpers::add_with_overflow_check<int> (plen, 0);
-}
-
 auto
 AndroidSystem::get_max_gref_count_from_system () noexcept -> long
 {

src/native/common/include/runtime-base/strings.hh

@@ -12,12 +12,12 @@
 
 #include <shared/helpers.hh>
 
-#if defined(XA_HOST_CLR)
-#include <constants.hh>
-#else
+#if defined(XA_HOST_MONOVM)
 #include <runtime-base/shared-constants.hh>
 
 using Constants = xamarin::android::internal::SharedConstants;
+#else
+#include <constants.hh>
 #endif
 
 namespace xamarin::android {

src/native/common/include/runtime-base/timing-internal.hh

@@ -16,13 +16,13 @@
 #include <thread>
 #include <vector>
 
-#if defined(XA_HOST_CLR)
-#include <constants.hh>
-#else
+#if defined(XA_HOST_MONOVM)
 #include <runtime-base/shared-constants.hh>
 
 using Constants = xamarin::android::internal::SharedConstants;
 using namespace xamarin::android::internal;
+#else
+#include <constants.hh>
 #endif
 
 #include <runtime-base/logger.hh>
@@ -73,10 +73,10 @@ namespace xamarin::android {
 
 	class FastTiming final
 	{
-#if defined(XA_HOST_CLR)
-		using mutex = std::mutex;
-#else
+#if defined(XA_HOST_MONOVM)
 		using mutex = xamarin::android::mutex;
+#else
+		using mutex = std::mutex;
 #endif
 		enum class SequenceError
 		{

src/native/native.targets

@@ -91,6 +91,7 @@
   </Target>
 
   <Target Name="_ConfigureAndBuildArchiveDSOStub"
+          Condition=" '$(CMakeRuntimeFlavor)' == 'NativeAOT' "
           DependsOnTargets="_PrepareCommonProperties;_ConfigureArchiveDSOInputsAndOutputs"
           Inputs="@(_ArchiveDSOInput)"
           Outputs="@(_ArchiveDSOOutput)">

src/native/nativeaot/host/CMakeLists.txt

@@ -24,9 +24,17 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_NAOT_ANDROID_SUFFIX)
 set(XAMARIN_NAOT_ANDROID_LIB "naot-android${CHECKED_BUILD_INFIX}.${XAMARIN_NAOT_ANDROID_SUFFIX}")
 set(XAMARIN_NAOT_ANDROID_STATIC_LIB "${XAMARIN_NAOT_ANDROID_LIB}-static")
 
+set(CLR_SOURCES_PATH "../../clr")
+
 set(XAMARIN_MONODROID_SOURCES
   host.cc
   host-jni.cc
+
+  ../runtime-base/android-system.cc
+
+  # Sources from CoreCLR host
+  ${CLR_SOURCES_PATH}/runtime-base/android-system-shared.cc
+  ${CLR_SOURCES_PATH}/runtime-base/logger.cc
 )
 
 list(APPEND LOCAL_CLANG_CHECK_SOURCES
@@ -83,7 +91,6 @@ macro(lib_target_options TARGET_NAME)
   target_include_directories(
     ${TARGET_NAME} BEFORE
     PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR}/include
     ${EXTERNAL_DIR}
   )
 
@@ -92,6 +99,7 @@ macro(lib_target_options TARGET_NAME)
     SYSTEM PRIVATE
     ${SYSROOT_CXX_INCLUDE_DIR}
     ${RUNTIME_INCLUDE_DIR}
+    ${TEMP_MONO_RUNTIME_INCLUDE_DIR}
     ${LIBUNWIND_INCLUDE_DIRS}
   )
 
@@ -111,6 +119,7 @@ macro(lib_target_options TARGET_NAME)
 
   target_link_libraries(
     ${TARGET_NAME}
+    xa::java-interop
     -llog
   )
 endmacro ()