diff options
| author | Martin Stjernholm <mast@google.com> | 2019-02-28 18:53:20 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-28 18:53:20 -0800 |
| commit | 6241951371bb45fb98a60ece3343444741bdbfe9 (patch) | |
| tree | 87ddbb09d7e1a3efb234579e7205e501044cd972 | |
| parent | 0cec42ec329daa7c88f032b83ebdfea02c738cac (diff) | |
| parent | b791271b74a80c2670371385a4ebd475fd3c8cf3 (diff) | |
| download | oj-libjdwp-6241951371bb45fb98a60ece3343444741bdbfe9.tar.gz | |
Merge "Don't look for libnpt.so in java.library.path." am: bdf22a2da2
am: b791271b74
Change-Id: I3e13058063f154880183a6aa30535e08e3e1b26c
| -rw-r--r-- | src/share/back/debugInit.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/share/back/debugInit.c b/src/share/back/debugInit.c index 66d528273..2a1bd2172 100644 --- a/src/share/back/debugInit.c +++ b/src/share/back/debugInit.c @@ -259,7 +259,6 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved) jint jvmtiCompileTimeMajorVersion; jint jvmtiCompileTimeMinorVersion; jint jvmtiCompileTimeMicroVersion; - char *boot_path = NULL; char npt_lib[MAXPATHLEN]; /* See if it's already loaded */ @@ -337,15 +336,10 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved) 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; |