summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dimitry Ivanov <dimitry@google.com> 2015-12-14 09:57:56 -0800
committer Dimitry Ivanov <dimitry@google.com> 2015-12-14 09:59:31 -0800
commit7f57579b473749ce9bb13fd4ca25ec0adbdf0ca0 (patch)
tree510362d679009c6f4067c2375636e1a191cb3434
parent377cb3ba2e1cfe51967e5292268a9aae71ceca8c (diff)
Temporary disable linker-namespaces
Bug: http://b/26178910 Bug: http://b/26165097 Change-Id: I858c70dc72ec164ea7a79ad625ddda91367dae06
-rw-r--r--runtime/native/java_lang_Runtime.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/java_lang_Runtime.cc b/runtime/native/java_lang_Runtime.cc
index ff82772171..4a1e6c21c1 100644
--- a/runtime/native/java_lang_Runtime.cc
+++ b/runtime/native/java_lang_Runtime.cc
@@ -79,7 +79,7 @@ static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, job
// Starting with N nativeLoad uses classloader local
// linker namespace instead of global LD_LIBRARY_PATH
// (23 is Marshmallow)
- if (target_sdk_version == 0) {
+ if (target_sdk_version <= INT_MAX) {
SetLdLibraryPath(env, javaLdLibraryPath);
}