commit 1a349789537d7603cb675f6311592836a17ebe8e
author Dimitry Ivanov <dimitry@google.com> Mon Jan 04 17:20:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 04 17:20:39 2016 +0000
tree defc0f1477d98ae83638a4d39eb9b22dbdd423cf
parent cb43c7cc16feda19d700ac5e4c2474c3951bda5b
parent 681d0808a538fff59b04661fc9c4d26148d76291

Merge "Revert "Temporary disable linker-namespaces"" am: 100001a537
am: bcd3a68f94

* commit 'bcd3a68f94a82fc7684695b3fdb7e5acd4fe0192':
  Revert "Temporary disable linker-namespaces"

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 8020b41..403a4f4 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -138,7 +138,7 @@
                         jobject class_loader, bool is_shared, jstring java_library_path,
                         jstring java_permitted_path) {
 #if defined(__ANDROID__)
-  if (target_sdk_version <= INT_MAX || class_loader == nullptr) {
+  if (target_sdk_version == 0 || class_loader == nullptr) {
     return dlopen(path, RTLD_NOW);
   }