openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove workaround for libart greylist." into nyc-dev 

am: 595efd0

* commit '595efd04db3970180d2a2de97524ac5e9a421a25':
  Remove workaround for libart greylist.

Change-Id: I34f2ea67d7fc9823fdacbf8e116a0110a053acf3
This commit is contained in:
Alex Light 2016-04-25 22:18:48 +00:00 committed by android-build-merger
parent 7ac34d08ef 595efd04db
commit 650d283536
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libnativeloader/native_loader.cpp
View File

@ -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