commit e5c6f9d3821110df3781a8e9efbdada1305ab6b7
author Martin Stjernholm <mast@google.com> Thu Feb 28 19:03:56 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 28 19:03:56 2019 -0800
tree 87ddbb09d7e1a3efb234579e7205e501044cd972
parent ef89c2b7e81cc03bc7f57ff95b639f40eed0955f
parent 6241951371bb45fb98a60ece3343444741bdbfe9

Merge "Don't look for libnpt.so in java.library.path." am: bdf22a2da2 am: b791271b74
am: 6241951371

Change-Id: I6ddbc4438bcfa5a4b3b6c3a26664fc4d6e73cc0f

src/share/back/debugInit.c

diff --git a/src/share/back/debugInit.c b/src/share/back/debugInit.c
index 66d5282..2a1bd21 100644
--- a/src/share/back/debugInit.c
+++ b/src/share/back/debugInit.c
@@ -259,7 +259,6 @@
     jint              jvmtiCompileTimeMajorVersion;
     jint              jvmtiCompileTimeMinorVersion;
     jint              jvmtiCompileTimeMicroVersion;
-    char              *boot_path = NULL;
     char              npt_lib[MAXPATHLEN];
 
     /* See if it's already loaded */
@@ -337,15 +336,10 @@
         forceExit(1); /* Kill entire process, no core dump wanted */
     }
 
-    // ANDROID-CHANGED: Android uses java.library.path to store all library path information.
-    JVMTI_FUNC_PTR(gdata->jvmti, GetSystemProperty)
-        (gdata->jvmti, (const char *)"java.library.path",
-         &boot_path);
-
-    dbgsysBuildLibName(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
+    // ANDROID-CHANGED: Load libnpt.so with no path to use the system linker config to find it.
+    dbgsysBuildLibName(npt_lib, sizeof(npt_lib), "", NPT_LIBNAME);
     /* Npt and Utf function init */
     NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
-    jvmtiDeallocate(boot_path);
     if (gdata->npt == NULL) {
         ERROR_MESSAGE(("JDWP: unable to initialize NPT library"));
         return JNI_ERR;