Update for the recent main changes

Author: grendello

src/monodroid/CMakeLists.txt

@@ -511,7 +511,7 @@ if(ANDROID)
     ${LZ4_SOURCES}
     )
 
-  if(NOT DEBUG_BUILD AND ENABLE_NET6 AND ENABLE_MARSHAL_METHODS)
+  if(NOT DEBUG_BUILD AND ENABLE_NET AND ENABLE_MARSHAL_METHODS)
     list(APPEND XAMARIN_MONODROID_SOURCES
       ${SOURCES_DIR}/xamarin-android-app-context.cc
       )
@@ -588,7 +588,7 @@ else()
   list(APPEND MONOSGEN_LIB_LINK -lmonosgen-2.0)
 endif()
 
-if(NOT (ANDROID AND ENABLE_NET6))
+if(NOT (ANDROID AND ENABLE_NET))
   add_library(
     ${XAMARIN_INTERNAL_API_LIB}
     SHARED
@@ -618,7 +618,7 @@ target_link_options(
   )
 
 if(ANDROID)
-  if(NOT DEBUG_BUILD AND ENABLE_NET6 AND ENABLE_MARSHAL_METHODS)
+  if(NOT DEBUG_BUILD AND ENABLE_NET AND ENABLE_MARSHAL_METHODS)
     # The marshaling lib is used only when building for devices
     add_library(
       ${XAMARIN_APP_MARSHALING_LIB}
@@ -740,7 +740,7 @@ target_link_libraries(
   ${LINK_LIBS} xamarin-app
   )
 
-if((NOT DEBUG_BUILD) AND ANDROID AND ENABLE_NET6 AND ENABLE_MARSHAL_METHODS)
+if((NOT DEBUG_BUILD) AND ANDROID AND ENABLE_NET AND ENABLE_MARSHAL_METHODS)
   target_link_libraries(
     ${XAMARIN_MONO_ANDROID_LIB}
     ${XAMARIN_APP_MARSHALING_LIB}

src/monodroid/jni/application_dso_stub.cc

@@ -148,7 +148,7 @@ DSOCacheEntry dso_cache[] = {
 //
 // Support for marshal methods
 //
-#if defined (RELEASE) && defined (ANDROID) && defined (NET6)
+#if defined (RELEASE) && defined (ANDROID) && defined (NET)
 MonoImage* assembly_image_cache[] = {
 	nullptr,
 	nullptr,
@@ -188,4 +188,4 @@ void xamarin_app_init ([[maybe_unused]] get_function_pointer_fn fn)
 {
 	// Dummy
 }
-#endif // def RELEASE && def ANDROID && def NET6
+#endif // def RELEASE && def ANDROID && def NET

src/monodroid/jni/embedded-assemblies.hh

@@ -57,7 +57,7 @@ namespace xamarin::android::internal {
 	template<typename T>
 	concept LoaderData = requires (T a) {
 		requires std::same_as<T, bool>
-#if defined (NET6)
+#if defined (NET)
 		|| std::same_as<T, MonoAssemblyLoadContextGCHandle>
 #endif
 		;

src/monodroid/jni/mono-image-loader.hh

@@ -6,7 +6,7 @@
 #include <cstddef>
 
 #include <mono/metadata/image.h>
-#if defined (NET6)
+#if defined (NET)
 #include <mono/metadata/mono-private-unstable.h>
 #endif
 #include <mono/metadata/object.h>
@@ -17,7 +17,7 @@
 #include "search.hh"
 #include "strings.hh"
 
-#if defined (RELEASE) && defined (ANDROID) && defined (NET6) && defined (ENABLE_MARSHAL_METHODS)
+#if defined (RELEASE) && defined (ANDROID) && defined (NET) && defined (ENABLE_MARSHAL_METHODS)
 #define USE_CACHE 1
 #endif
 
@@ -52,7 +52,7 @@ namespace xamarin::android::internal {
 		}
 #endif // def USE_CACHE
 
-#if defined (NET6)
+#if defined (NET)
 		force_inline static MonoImage* load (dynamic_local_string<SENSIBLE_PATH_MAX> const& name, MonoAssemblyLoadContextGCHandle alc_gchandle, hash_t name_hash, uint8_t *assembly_data, uint32_t assembly_data_size) noexcept
 		{
 			log_info (LOG_DEFAULT, "Loading assembly %s; hash 0x%zx", name.get (), name_hash);
@@ -74,7 +74,7 @@ namespace xamarin::android::internal {
 
 			return load (name, alc_gchandle, xxhash::hash (name.get (), name.length ()), assembly_data, assembly_data_size);
 		}
-#endif
+#endif // def NET
 
 		force_inline static MonoImage* load (dynamic_local_string<SENSIBLE_PATH_MAX> const& name, bool ref_only, hash_t name_hash, uint8_t *assembly_data, uint32_t assembly_data_size) noexcept
 		{
@@ -136,7 +136,7 @@ namespace xamarin::android::internal {
 			// support for unloadable Assembly Load Contexts) and the actual write operation to the destination is
 			// atomic
 			assembly_image_cache[index] = image;
-#endif // def RELEASE && def ANDROID && def NET6
+#endif // def RELEASE && def ANDROID && def NET
 			return image;
 		}
 

src/monodroid/jni/monodroid-glue-internal.hh

@@ -351,8 +351,7 @@ namespace xamarin::android::internal
 #if defined (RELEASE) && defined (ANDROID)
 		static void* get_function_pointer (uint32_t mono_image_index, uint32_t class_token, uint32_t method_token) noexcept;
 #endif // def RELEASE && def ANDROID
-#endif // def NET6
-
+#endif // def NET
 
 #if defined (DEBUG)
 		void set_debug_env_vars (void);

src/monodroid/jni/monodroid-glue.cc

@@ -874,9 +874,9 @@ MonodroidRuntime::mono_runtime_init ([[maybe_unused]] dynamic_local_string<PROPE
 	mono_install_assembly_preload_hook (open_from_update_dir, nullptr);
 #endif
 
-#if defined (RELEASE) && defined (ANDROID) && defined (NET6) && ENABLE_MARSHAL_METHODS
+#if defined (RELEASE) && defined (ANDROID) && defined (NET) && ENABLE_MARSHAL_METHODS
 	xamarin_app_init (get_function_pointer);
-#endif // def RELEASE && def ANDROID && def NET6
+#endif // def RELEASE && def ANDROID && def NET
 }
 
 #if defined (NET)

src/monodroid/jni/xamarin-app.hh

@@ -262,7 +262,7 @@ MONO_API MONO_API_EXPORT DSOCacheEntry dso_cache[];
 //
 // Support for marshal methods
 //
-#if defined (RELEASE) && defined (ANDROID) && defined (NET6)
+#if defined (RELEASE) && defined (ANDROID) && defined (NET)
 struct MarshalMethodsManagedClass
 {
 	const uint32_t   token;
@@ -293,6 +293,6 @@ MONO_API MONO_API_EXPORT MarshalMethodsManagedClass marshal_methods_class_cache[
 using get_function_pointer_fn = void*(*)(uint32_t mono_image_index, uint32_t class_token, uint32_t method_token);
 
 MONO_API_EXPORT void xamarin_app_init (get_function_pointer_fn fn);
-#endif // def RELEASE && def ANDROID && def NET6
+#endif // def RELEASE && def ANDROID && def NET
 
 #endif // __XAMARIN_ANDROID_TYPEMAP_H