From 91d2c5c1d1157f27e723d8ebee458913c6f0ed43 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Fri, 7 May 2021 22:44:29 +0000 Subject: Revert "Avoid loading external libraries from ARTs internal linker namespace." This reverts commit 582448f29f2f2529202bf868d00ba5d3d3776bb6. Reason for revert: breaks tests Change-Id: I2e0b2a28d4644b314887673d4aef4f1094aea289 --- libnativeloader/native_loader.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libnativeloader/native_loader.cpp') 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()); } -- cgit v1.2.3-59-g8ed1b