Merge "Temporary disable linker-namespaces"

am: 9fb5047549

* commit '9fb50475497ab66ad547ffd17cc5a611b422cd09':
  Temporary disable linker-namespaces
This commit is contained in:
Dimitry Ivanov 2015-12-11 22:22:00 -08:00 committed by android-build-merger
commit 4bbed77aaf

View file

@ -132,7 +132,7 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat
jobject class_loader, jstring java_library_path,
jstring java_permitted_path) {
#if defined(__ANDROID__)
if (target_sdk_version == 0 || class_loader == nullptr) {
if (target_sdk_version <= INT_MAX || class_loader == nullptr) {
return dlopen(path, RTLD_NOW);
}