diff options
| author | Alex Light <allight@google.com> | 2016-04-15 10:18:43 -0700 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2016-04-15 12:42:44 -0700 |
| commit | 3150fa25140fd5e2d66569841bd8e8eba07adb27 (patch) | |
| tree | c4a5fcfdca5f0e97df5459ca06b77537c7a22bf3 /libnativeloader/native_loader.cpp | |
| parent | 578bc039dc66e8ddaf186d901f9d043e506e1950 (diff) | |
Remove workaround for libart greylist.
Bug: 27775991
Change-Id: I77f03b95f70957df58e666b011a07cfc2a33b480
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index f28a69388..81dc31667 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -40,10 +40,6 @@ namespace android { static constexpr const char* kPublicNativeLibrariesSystemConfig = "/system/etc/public.libraries.txt"; static constexpr const char* kPublicNativeLibrariesVendorConfig = "/vendor/etc/public.libraries.txt"; -static bool namespace_workaround_enabled(int32_t target_sdk_version) { - return target_sdk_version <= 23; -} - class LibraryNamespaces { public: LibraryNamespaces() : initialized_(false) { } @@ -156,18 +152,7 @@ class LibraryNamespaces { bool InitPublicNamespace(const char* library_path, int32_t target_sdk_version) { std::string publicNativeLibraries = public_libraries_; - // TODO (dimitry): This is a workaround for http://b/26436837 - // will be removed before the release. - if (namespace_workaround_enabled(target_sdk_version)) { - // check if libart.so is loaded. - void* handle = dlopen("libart.so", RTLD_NOW | RTLD_NOLOAD); - if (handle != nullptr) { - publicNativeLibraries += ":libart.so"; - dlclose(handle); - } - } - // END OF WORKAROUND - + UNUSED(target_sdk_version); // (http://b/25844435) - Some apps call dlopen from generated code (mono jited // code is one example) unknown to linker in which case linker uses anonymous // namespace. The second argument specifies the search path for the anonymous |