Let's see what breaks

grendello · grendello · commit 2dd71f7a69f4 · 2024-08-28T18:43:57.000+02:00
diff --git a/build-tools/create-packs/Microsoft.Android.Runtime.proj b/build-tools/create-packs/Microsoft.Android.Runtime.proj
@@ -48,6 +48,7 @@ projects that use the Microsoft.Android framework in .NET 6+.
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libxa-lz4.a" />
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libxa-shared-bits.a" />
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release-static.a" />
+      <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libpinvoke-override-dynamic.a" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssemblies->'%(Filename)%(Extension)')" Profile="Android" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssets->'%(Filename)%(Extension)')" Profile="Android" />
     </ItemGroup>
diff --git a/src/native/monodroid/CMakeLists.txt b/src/native/monodroid/CMakeLists.txt
@@ -185,6 +185,7 @@ macro(lib_target_options TARGET_NAME)
     ${SHARED_LIB_NAME}
     xa::runtime-base
     xa::java-interop
+    xa::pinvoke-override-precompiled
     xa::lz4
     -lmonosgen-2.0
     -llog
diff --git a/src/native/monodroid/internal-pinvokes.cc b/src/native/monodroid/internal-pinvokes.cc
@@ -15,14 +15,23 @@ monodroid_get_log_categories ()
 int
 monodroid_get_system_property (const char *name, char **value)
 {
+<<<<<<< HEAD
     return AndroidSystem::monodroid_get_system_property (name, value);
+=======
+        return AndroidSystem::monodroid_get_system_property (name, value);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
 monodroid_embedded_assemblies_set_assemblies_prefix (const char *prefix)
 {
+<<<<<<< HEAD
     embeddedAssemblies.set_assemblies_prefix (prefix);
     return 0;
+=======
+        embeddedAssemblies.set_assemblies_prefix (prefix);
+        return 0;
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
@@ -62,13 +71,21 @@ monodroid_log (LogLevel level, LogCategories category, const char *message)
 void
 monodroid_free (void *ptr)
 {
+<<<<<<< HEAD
     free (ptr);
+=======
+        free (ptr);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
 _monodroid_max_gref_get ()
 {
+<<<<<<< HEAD
     return static_cast<int>(AndroidSystem::get_max_gref_count ());
+=======
+        return static_cast<int>(AndroidSystem::get_max_gref_count ());
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
@@ -81,19 +98,31 @@ _monodroid_gref_get ()
 void
 _monodroid_gref_log (const char *message)
 {
+<<<<<<< HEAD
     osBridge._monodroid_gref_log (message);
+=======
+        osBridge._monodroid_gref_log (message);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
 _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     return osBridge._monodroid_gref_log_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
+=======
+        return osBridge._monodroid_gref_log_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 _monodroid_gref_log_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     osBridge._monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
+=======
+        osBridge._monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
@@ -105,50 +134,83 @@ _monodroid_weak_gref_get ()
 void
 _monodroid_weak_gref_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     osBridge._monodroid_weak_gref_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
+=======
+        osBridge._monodroid_weak_gref_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     osBridge._monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
+=======
+        osBridge._monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 _monodroid_lref_log_new (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     osBridge._monodroid_lref_log_new (lrefc, handle, type, threadName, threadId, from, from_writable);
+=======
+        osBridge._monodroid_lref_log_new (lrefc, handle, type, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 _monodroid_lref_log_delete (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
+<<<<<<< HEAD
     osBridge._monodroid_lref_log_delete (lrefc, handle, type, threadName, threadId, from, from_writable);
+=======
+        osBridge._monodroid_lref_log_delete (lrefc, handle, type, threadName, threadId, from, from_writable);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 _monodroid_gc_wait_for_bridge_processing ()
 {
+<<<<<<< HEAD
     mono_gc_wait_for_bridge_processing ();
+=======
+        mono_gc_wait_for_bridge_processing ();
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 int
 _monodroid_get_android_api_level ()
 {
+<<<<<<< HEAD
     return monodroidRuntime.get_android_api_level ();
+=======
+        return monodroidRuntime.get_android_api_level ();
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void
 monodroid_clear_gdb_wait ()
 {
+<<<<<<< HEAD
     monodroidRuntime.set_monodroid_gdb_wait (false);
+=======
+        monodroidRuntime.set_monodroid_gdb_wait (false);
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void*
 _monodroid_get_identity_hash_code (JNIEnv *env, void *v)
 {
+<<<<<<< HEAD
     intptr_t rv = env->CallStaticIntMethod (monodroidRuntime.get_java_class_System (), monodroidRuntime.get_java_class_method_System_identityHashCode (), v);
     return (void*) rv;
+=======
+        intptr_t rv = env->CallStaticIntMethod (monodroidRuntime.get_java_class_System (), monodroidRuntime.get_java_class_method_System_identityHashCode (), v);
+        return (void*) rv;
+>>>>>>> 13ba4b152 (Let's see what breaks)
 }
 
 void*
@@ -306,7 +368,11 @@ monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)
   https://github.com/dotnet/java-interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266
 
   it should also accept libmono_path = nullptr parameter
+<<<<<<< HEAD
  */
+=======
+*/
+>>>>>>> 13ba4b152 (Let's see what breaks)
 int
 monodroid_dylib_mono_init (void *mono_imports, [[maybe_unused]] const char *libmono_path)
 {
diff --git a/src/native/pinvoke-override/CMakeLists.txt b/src/native/pinvoke-override/CMakeLists.txt
@@ -35,8 +35,11 @@ macro(create_library _libname _alias _sources)
 
   add_library(${_alias} ALIAS ${_libname})
 
+<<<<<<< HEAD
   set_static_library_suffix(${_libname})
 
+=======
+>>>>>>> 13ba4b152 (Let's see what breaks)
   target_compile_definitions(
     ${_libname}
     PRIVATE
diff --git a/src/native/pinvoke-override/common.cc b/src/native/pinvoke-override/common.cc
@@ -3,4 +3,8 @@
 using namespace xamarin::android;
 
 PinvokeOverride::pinvoke_library_map PinvokeOverride::other_pinvoke_map (PinvokeOverride::LIBRARY_MAP_INITIAL_BUCKET_COUNT);
+<<<<<<< HEAD
 xamarin::android::mutex PinvokeOverride::pinvoke_map_write_lock;
+=======
+std::mutex PinvokeOverride::pinvoke_map_write_lock;
+>>>>>>> 13ba4b152 (Let's see what breaks)
diff --git a/src/native/pinvoke-override/pinvoke-override-api.hh b/src/native/pinvoke-override/pinvoke-override-api.hh
@@ -78,14 +78,21 @@ namespace xamarin::android {
 		static void* monodroid_pinvoke_override (const char *library_name, const char *entrypoint_name);
 
 	private:
+<<<<<<< HEAD
 		static xamarin::android::mutex  pinvoke_map_write_lock;
+=======
+		static std::mutex             pinvoke_map_write_lock;
+>>>>>>> 13ba4b152 (Let's see what breaks)
 		static pinvoke_library_map    other_pinvoke_map;
 
 #if defined(PRECOMPILED)
 		static inline void *system_native_library_handle = nullptr;
 		static inline void *system_security_cryptography_native_android_library_handle = nullptr;
 		static inline void *system_io_compression_native_library_handle = nullptr;
+<<<<<<< HEAD
 		static inline void *system_globalization_native_library_handle = nullptr;
+=======
+>>>>>>> 13ba4b152 (Let's see what breaks)
 #endif
 	};
 }
diff --git a/src/native/pinvoke-override/pinvoke-tables.include b/src/native/pinvoke-override/pinvoke-tables.include
diff --git a/src/native/pinvoke-override/precompiled.cc b/src/native/pinvoke-override/precompiled.cc
diff --git a/src/native/runtime-base/internal-pinvokes.hh b/src/native/runtime-base/internal-pinvokes.hh

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,23 @@ monodroid_get_log_categories ()`
`15`	`15`	`int`
`16`	`16`	`monodroid_get_system_property (const char name, char *value)`
`17`	`17`	`{`
	`18`	`+<<<<<<< HEAD`
`18`	`19`	`return AndroidSystem::monodroid_get_system_property (name, value);`
	`20`	`+=======`
	`21`	`+ return AndroidSystem::monodroid_get_system_property (name, value);`
	`22`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`int`
`22`	`26`	`monodroid_embedded_assemblies_set_assemblies_prefix (const char *prefix)`
`23`	`27`	`{`
	`28`	`+<<<<<<< HEAD`
`24`	`29`	`embeddedAssemblies.set_assemblies_prefix (prefix);`
`25`	`30`	`return 0;`
	`31`	`+=======`
	`32`	`+ embeddedAssemblies.set_assemblies_prefix (prefix);`
	`33`	`+ return 0;`
	`34`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`26`	`35`	`}`
`27`	`36`
`28`	`37`	`void`
`@@ -62,13 +71,21 @@ monodroid_log (LogLevel level, LogCategories category, const char *message)`
`62`	`71`	`void`
`63`	`72`	`monodroid_free (void *ptr)`
`64`	`73`	`{`
	`74`	`+<<<<<<< HEAD`
`65`	`75`	`free (ptr);`
	`76`	`+=======`
	`77`	`+ free (ptr);`
	`78`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`66`	`79`	`}`
`67`	`80`
`68`	`81`	`int`
`69`	`82`	`_monodroid_max_gref_get ()`
`70`	`83`	`{`
	`84`	`+<<<<<<< HEAD`
`71`	`85`	`return static_cast<int>(AndroidSystem::get_max_gref_count ());`
	`86`	`+=======`
	`87`	`+ return static_cast<int>(AndroidSystem::get_max_gref_count ());`
	`88`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`72`	`89`	`}`
`73`	`90`
`74`	`91`	`int`
`@@ -81,19 +98,31 @@ _monodroid_gref_get ()`
`81`	`98`	`void`
`82`	`99`	`_monodroid_gref_log (const char *message)`
`83`	`100`	`{`
	`101`	`+<<<<<<< HEAD`
`84`	`102`	`osBridge._monodroid_gref_log (message);`
	`103`	`+=======`
	`104`	`+ osBridge._monodroid_gref_log (message);`
	`105`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`85`	`106`	`}`
`86`	`107`
`87`	`108`	`int`
`88`	`109`	`_monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char threadName, int threadId, const char from, int from_writable)`
`89`	`110`	`{`
	`111`	`+<<<<<<< HEAD`
`90`	`112`	`return osBridge._monodroid_gref_log_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);`
	`113`	`+=======`
	`114`	`+ return osBridge._monodroid_gref_log_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);`
	`115`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`91`	`116`	`}`
`92`	`117`
`93`	`118`	`void`
`94`	`119`	`_monodroid_gref_log_delete (jobject handle, char type, const char threadName, int threadId, const char from, int from_writable)`
`95`	`120`	`{`
	`121`	`+<<<<<<< HEAD`
`96`	`122`	`osBridge._monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);`
	`123`	`+=======`
	`124`	`+ osBridge._monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);`
	`125`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`97`	`126`	`}`
`98`	`127`
`99`	`128`	`int`
`@@ -105,50 +134,83 @@ _monodroid_weak_gref_get ()`
`105`	`134`	`void`
`106`	`135`	`_monodroid_weak_gref_new (jobject curHandle, char curType, jobject newHandle, char newType, const char threadName, int threadId, const char from, int from_writable)`
`107`	`136`	`{`
	`137`	`+<<<<<<< HEAD`
`108`	`138`	`osBridge._monodroid_weak_gref_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);`
	`139`	`+=======`
	`140`	`+ osBridge._monodroid_weak_gref_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);`
	`141`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`109`	`142`	`}`
`110`	`143`
`111`	`144`	`void`
`112`	`145`	`_monodroid_weak_gref_delete (jobject handle, char type, const char threadName, int threadId, const char from, int from_writable)`
`113`	`146`	`{`
	`147`	`+<<<<<<< HEAD`
`114`	`148`	`osBridge._monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);`
	`149`	`+=======`
	`150`	`+ osBridge._monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);`
	`151`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`115`	`152`	`}`
`116`	`153`
`117`	`154`	`void`
`118`	`155`	`_monodroid_lref_log_new (int lrefc, jobject handle, char type, const char threadName, int threadId, const char from, int from_writable)`
`119`	`156`	`{`
	`157`	`+<<<<<<< HEAD`
`120`	`158`	`osBridge._monodroid_lref_log_new (lrefc, handle, type, threadName, threadId, from, from_writable);`
	`159`	`+=======`
	`160`	`+ osBridge._monodroid_lref_log_new (lrefc, handle, type, threadName, threadId, from, from_writable);`
	`161`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`121`	`162`	`}`
`122`	`163`
`123`	`164`	`void`
`124`	`165`	`_monodroid_lref_log_delete (int lrefc, jobject handle, char type, const char threadName, int threadId, const char from, int from_writable)`
`125`	`166`	`{`
	`167`	`+<<<<<<< HEAD`
`126`	`168`	`osBridge._monodroid_lref_log_delete (lrefc, handle, type, threadName, threadId, from, from_writable);`
	`169`	`+=======`
	`170`	`+ osBridge._monodroid_lref_log_delete (lrefc, handle, type, threadName, threadId, from, from_writable);`
	`171`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`127`	`172`	`}`
`128`	`173`
`129`	`174`	`void`
`130`	`175`	`_monodroid_gc_wait_for_bridge_processing ()`
`131`	`176`	`{`
	`177`	`+<<<<<<< HEAD`
`132`	`178`	`mono_gc_wait_for_bridge_processing ();`
	`179`	`+=======`
	`180`	`+ mono_gc_wait_for_bridge_processing ();`
	`181`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`133`	`182`	`}`
`134`	`183`
`135`	`184`	`int`
`136`	`185`	`_monodroid_get_android_api_level ()`
`137`	`186`	`{`
	`187`	`+<<<<<<< HEAD`
`138`	`188`	`return monodroidRuntime.get_android_api_level ();`
	`189`	`+=======`
	`190`	`+ return monodroidRuntime.get_android_api_level ();`
	`191`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`139`	`192`	`}`
`140`	`193`
`141`	`194`	`void`
`142`	`195`	`monodroid_clear_gdb_wait ()`
`143`	`196`	`{`
	`197`	`+<<<<<<< HEAD`
`144`	`198`	`monodroidRuntime.set_monodroid_gdb_wait (false);`
	`199`	`+=======`
	`200`	`+ monodroidRuntime.set_monodroid_gdb_wait (false);`
	`201`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`145`	`202`	`}`
`146`	`203`
`147`	`204`	`void*`
`148`	`205`	`_monodroid_get_identity_hash_code (JNIEnv env, void v)`
`149`	`206`	`{`
	`207`	`+<<<<<<< HEAD`
`150`	`208`	`intptr_t rv = env->CallStaticIntMethod (monodroidRuntime.get_java_class_System (), monodroidRuntime.get_java_class_method_System_identityHashCode (), v);`
`151`	`209`	`return (void*) rv;`
	`210`	`+=======`
	`211`	`+ intptr_t rv = env->CallStaticIntMethod (monodroidRuntime.get_java_class_System (), monodroidRuntime.get_java_class_method_System_identityHashCode (), v);`
	`212`	`+ return (void*) rv;`
	`213`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`152`	`214`	`}`
`153`	`215`
`154`	`216`	`void*`
`@@ -306,7 +368,11 @@ monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)`
`306`	`368`	`https://github.com/dotnet/java-interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266`
`307`	`369`
`308`	`370`	`it should also accept libmono_path = nullptr parameter`
	`371`	`+<<<<<<< HEAD`
`309`	`372`	`*/`
	`373`	`+=======`
	`374`	`+*/`
	`375`	`+>>>>>>> 13ba4b152 (Let's see what breaks)`
`310`	`376`	`int`
`311`	`377`	`monodroid_dylib_mono_init (void mono_imports, [[maybe_unused]] const char libmono_path)`
`312`	`378`	`{`