commit 96259f1f2f37d222ce321fd223655d1134a8ba01
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 18 10:04:51 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 18 11:31:26 2019 +0000
tree e77eba088bd556dc44375e68eaa622a8301617aa
parent 3c29c66933f81dbb9af17caa197257ac67ee3c78

Pass the Java caller's location to OpenNativeLibrary.

Will be used to find the linker namespace to use.

Bug: 122874359
Test: m, gtest, run-test, CtsJdwpTests

Change-Id: Ibeebe20844e2bbdc306d65fb4f2ee3237343fa09

openjdkjvm/OpenjdkJvm.cc

diff --git a/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc
index b2c4bb7..8297c54 100644
--- a/openjdkjvm/OpenjdkJvm.cc
+++ b/openjdkjvm/OpenjdkJvm.cc
@@ -318,7 +318,8 @@
 
 JNIEXPORT jstring JVM_NativeLoad(JNIEnv* env,
                                  jstring javaFilename,
-                                 jobject javaLoader) {
+                                 jobject javaLoader,
+                                 jclass caller) {
   ScopedUtfChars filename(env, javaFilename);
   if (filename.c_str() == nullptr) {
     return nullptr;
@@ -330,6 +331,7 @@
     bool success = vm->LoadNativeLibrary(env,
                                          filename.c_str(),
                                          javaLoader,
+                                         caller,
                                          &error_msg);
     if (success) {
       return nullptr;