diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-01-16 20:20:27 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-01-16 21:40:34 +0000 |
| commit | d06cb94d254e294a345af2712c8c6627bfa543a4 (patch) | |
| tree | 8f7ca2a082ea12ac4ed63e5d101894c8be6679c3 /libnativeloader | |
| parent | 1d69860960f51f166ed570206936e1e46bca7c32 (diff) | |
| download | system_core-d06cb94d254e294a345af2712c8c6627bfa543a4.tar.gz system_core-d06cb94d254e294a345af2712c8c6627bfa543a4.tar.bz2 system_core-d06cb94d254e294a345af2712c8c6627bfa543a4.zip | |
libnativeloader: remove stubs for now.
Seems to break VMDebug test.
Also add missed strdup in returned error message.
bug: 122957265
Test: VMDebug
Change-Id: I64727d707f20c0e6afcb5455edf20c99011a81dc
Diffstat (limited to 'libnativeloader')
| -rw-r--r-- | libnativeloader/Android.bp | 9 | ||||
| -rw-r--r-- | libnativeloader/native_loader.cpp | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp index 8903b72c7..2802d3611 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -23,15 +23,6 @@ cc_library { "llndk.libraries.txt", "vndksp.libraries.txt", ], - target: { - android: { - version_script: "libnativeloader.map.txt", - }, - }, - stubs: { - symbol_file: "libnativeloader.map.txt", - versions: ["1"], - }, } cc_library_headers { diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index f231afa5b..af7df727a 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -632,7 +632,7 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat *needs_native_bridge = false; void* handle = dlopen(path, RTLD_NOW); if (handle == nullptr) { - *error_msg = dlerror(); + *error_msg = strdup(dlerror()); } return handle; } |