Bump to jonpryor/java.interop@ceada6c7

Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=3998131&view=logs&j=db00894d-3ef4-5d97-073c-254fbd613a41&t=379a81d4-3138-5f28-ec7b-ce4074947b64

The xamarin-android integration PR is experiencing integration test
failures with the Android Designer:

	Renderer >> 4 [monodroid] Calling into managed runtime init
	Renderer (error) >>
	Renderer (error) >> Unhandled Exception:
	Renderer (error) >> System.EntryPointNotFoundException: java_interop_jnienv_get_java_vm assembly:<unknown assembly> type:<unknown type> member:(null)
	Renderer (error) >> at (wrapper managed-to-native) Java.Interop.NativeMethods.java_interop_jnienv_get_java_vm(intptr,intptr&)
	Renderer (error) >> at Java.Interop.JniEnvironment+References.GetJavaVM (System.IntPtr jnienv, System.IntPtr& vm) [0x00000] in <0f003a4904fd44d0a8cc6a63962ab40b>:0
	Renderer (error) >> at Java.Interop.JniEnvironmentInfo.set_EnvironmentPointer (System.IntPtr value) [0x00037] in <0f003a4904fd44d0a8cc6a63962ab40b>:0
	Renderer (error) >> at Java.Interop.JniEnvironmentInfo..ctor (System.IntPtr environmentPointer, Java.Interop.JniRuntime runtime) [0x00006] in <0f003a4904fd44d0a8cc6a63962ab40b>:0
	Renderer (error) >> at Java.Interop.JniRuntime..ctor (Java.Interop.JniRuntime+CreationOptions options) [0x0017b] in <0f003a4904fd44d0a8cc6a63962ab40b>:0
	Renderer (error) >> at Android.Runtime.AndroidRuntime..ctor (System.IntPtr jnienv, System.IntPtr vm, System.Boolean allocNewObjectSupported, System.IntPtr classLoader, System.IntPtr classLoader_loadClass, System.Boolean jniAddNativeMethodRegistrationAttributePresent) [0x00000] in /Users/builder/azdo/_work/4/s/xamarin-android/src/Mono.Android/Android.Runtime/AndroidRuntime.cs:25

The question is, *why*.

@jonpryor still isn't sure, but has a conjecture: among the changes
involved is a "forced" change to always use `RTLD_LAZY | RTLD_LOCAL`,
no matter what the calling code actually specified.

For test purposes, update `java_interop_load_library()` to "pass
through" the flags value on Unix, so that the calling code can
continue to use e.g. `RTLD_GLOBAL`, if desired.

Let's see if that fixes anything?

Additionally, add MOAR LOGGING MESSAGES to help see what's happening.

Author: jonpryor

external/Java.Interop

@@ -360,7 +360,8 @@ AndroidSystem::load_dso (const char *path, int dl_flags, bool skip_exists_check)
 	}
 
 	char *error = nullptr;
-	void *handle = java_interop_load_library (path, 0, &error);
+	void *handle = java_interop_load_library (path, dl_flags, &error);
+	log_warn (LOG_DEFAULT, "# jonp: AndroidSystem::load_dso(`%s`): handle=%p error=%s", path, handle, error);
 	if (handle == nullptr && utils.should_log (LOG_ASSEMBLY))
 		log_info_nocheck (LOG_ASSEMBLY, "Failed to load shared library '%s'. %s", path, error);
 	java_interop_free (error);

src/monodroid/jni/android-system.cc

@@ -33,6 +33,12 @@
 #include <android/log.h>
 #endif
 
+#if defined (APPLE_OS_X)
+#include <dlfcn.h>
+#else
+#define RTLD_LAZY 0
+#endif  // def APPLE_OX_X
+
 #include "java-interop-util.h"
 
 #include "monodroid.h"
@@ -80,14 +86,15 @@ Debug::monodroid_profiler_load (const char *libmono_path, const char *desc, cons
 	}
 	simple_pointer_guard<char[]> mname (mname_ptr);
 
+	int dlopen_flags = RTLD_LAZY;
 	simple_pointer_guard<char[]> libname (utils.string_concat ("libmono-profiler-", mname.get (), ".so"));
 	bool found = false;
-	void *handle = androidSystem.load_dso_from_any_directories (libname, 0);
+	void *handle = androidSystem.load_dso_from_any_directories (libname, dlopen_flags);
 	found = load_profiler_from_handle (handle, desc, mname);
 
 	if (!found && libmono_path != nullptr) {
 		simple_pointer_guard<char[]> full_path (utils.path_combine (libmono_path, libname));
-		handle = androidSystem.load_dso (full_path, 0, FALSE);
+		handle = androidSystem.load_dso (full_path, dlopen_flags, FALSE);
 		found = load_profiler_from_handle (handle, desc, mname);
 	}
 

src/monodroid/jni/debug.cc

@@ -12,6 +12,10 @@
 
 #if defined (APPLE_OS_X)
 #include <dlfcn.h>
+#else
+#define RTLD_LAZY 0
+#define RTLD_GLOBAL 0
+#define RTLD_NOW 0
 #endif  // def APPLE_OX_X
 
 #include <fcntl.h>
@@ -156,11 +160,12 @@ MonodroidRuntime::setup_bundled_app (const char *dso_name)
 	if (!application_config.is_a_bundled_app)
 		return;
 
+	static int dlopen_flags = RTLD_LAZY;
 	void *libapp = nullptr;
 
 	if (androidSystem.is_embedded_dso_mode_enabled ()) {
 		log_info (LOG_DEFAULT, "bundle app: embedded DSO mode");
-		libapp = androidSystem.load_dso_from_any_directories (dso_name, 0);
+		libapp = androidSystem.load_dso_from_any_directories (dso_name, dlopen_flags);
 	} else {
 		bool needs_free = false;
 		log_info (LOG_DEFAULT, "bundle app: normal mode");
@@ -169,7 +174,7 @@ MonodroidRuntime::setup_bundled_app (const char *dso_name)
 		if (bundle_path == nullptr)
 			return;
 		log_info (LOG_BUNDLE, "Attempting to load bundled app from %s", bundle_path);
-		libapp = androidSystem.load_dso (bundle_path, 0, true);
+		libapp = androidSystem.load_dso (bundle_path, dlopen_flags, true);
 		if (needs_free)
 			delete[] bundle_path;
 	}
@@ -1071,7 +1076,13 @@ setup_gc_logging (void)
 force_inline int
 MonodroidRuntime::convert_dl_flags (int flags)
 {
-	return 0;
+	int lflags = flags & static_cast<int> (MONO_DL_LOCAL) ? 0: RTLD_GLOBAL;
+
+	if (flags & static_cast<int> (MONO_DL_LAZY))
+		lflags |= RTLD_LAZY;
+	else
+		lflags |= RTLD_NOW;
+	return lflags;
 }
 
 force_inline void
@@ -1191,6 +1202,7 @@ MonodroidRuntime::monodroid_dlsym (void *handle, const char *name, char **err, [
 	char *e = nullptr;
 
 	s = java_interop_get_symbol_address (handle, name, &e);
+	log_warn (LOG_DEFAULT, "# jonp: monodroid_dlsym(%p, '%s') s=%p e=%s", handle, name, s, e);
 
 	if (!s && err) {
 		*err = utils.monodroid_strdup_printf ("Could not find symbol '%s': %s", name, e);
@@ -1372,7 +1384,7 @@ MonodroidRuntime::disable_external_signal_handlers (void)
 	if (!androidSystem.is_mono_llvm_enabled ())
 		return;
 
-	void *llvm  = androidSystem.load_dso ("libLLVM.so", 0, TRUE);
+	void *llvm  = androidSystem.load_dso ("libLLVM.so", RTLD_LAZY, TRUE);
 	if (llvm) {
 		bool *disable_signals = reinterpret_cast<bool*> (java_interop_get_symbol_address (llvm, "_ZN4llvm23DisablePrettyStackTraceE", nullptr));
 		if (disable_signals) {
@@ -1607,7 +1619,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 	if (my_location != nullptr) {
 		simple_pointer_guard<char, false> dso_path (utils.path_combine (my_location, API_DSO_NAME));
 		log_info (LOG_DEFAULT, "Attempting to load %s", dso_path.get ());
-		api_dso_handle = java_interop_load_library (dso_path.get (), 0, nullptr);
+		api_dso_handle = java_interop_load_library (dso_path.get (), RTLD_NOW, nullptr);
 #if defined (APPLE_OS_X)
 		delete[] my_location;
 #else   // !defined(APPLE_OS_X)
@@ -1617,11 +1629,11 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 
 	if (api_dso_handle == nullptr) {
 		log_info (LOG_DEFAULT, "Attempting to load %s with \"bare\" dlopen", API_DSO_NAME);
-		api_dso_handle = java_interop_load_library (API_DSO_NAME, 0, nullptr);
+		api_dso_handle = java_interop_load_library (API_DSO_NAME, RTLD_NOW, nullptr);
 	}
 #endif  // defined(WINDOWS) || defined(APPLE_OS_X)
 	if (api_dso_handle == nullptr)
-		api_dso_handle = androidSystem.load_dso_from_any_directories (API_DSO_NAME, 0);
+		api_dso_handle = androidSystem.load_dso_from_any_directories (API_DSO_NAME, RTLD_NOW);
 	init_internal_api_dso (api_dso_handle);
 
 	mono_dl_fallback_register (monodroid_dlopen, monodroid_dlsym, nullptr, nullptr);