diff options
author | 2021-05-07 22:44:29 +0000 | |
---|---|---|
committer | 2021-05-09 00:37:05 +0000 | |
commit | 91d2c5c1d1157f27e723d8ebee458913c6f0ed43 (patch) | |
tree | 61089b69928171706cf93d939bb068d115e92c5d /libnativeloader/native_loader.cpp | |
parent | 6958df93f8cb3d82bddadbabb5ed94b3b63a7f14 (diff) |
Revert "Avoid loading external libraries from ARTs internal linker namespace."
This reverts commit 582448f29f2f2529202bf868d00ba5d3d3776bb6.
Reason for revert: breaks tests
Change-Id: I2e0b2a28d4644b314887673d4aef4f1094aea289
Diffstat (limited to 'libnativeloader/native_loader.cpp')
-rw-r--r-- | libnativeloader/native_loader.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 30c7b5a377..b34692ae16 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -254,11 +254,7 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat } } - // Fall back to the system namespace. This happens for preloaded JNI - // libraries in the zygote. - // TODO(b/185833744): Investigate if this should fall back to the app main - // namespace (aka anonymous namespace) instead. - void* handle = OpenSystemLibrary(path, RTLD_NOW); + void* handle = dlopen(path, RTLD_NOW); if (handle == nullptr) { *error_msg = strdup(dlerror()); } |