summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dimitry Ivanov <dimitry@google.com> 2015-12-14 18:04:02 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-12-14 18:04:02 +0000
commita8be6ae6fcf1c58c0c2067739352e16b92972c41 (patch)
tree1fbd6a7f025412c636a96cc82f158513c0f3b125
parent395125122a57dd042a507fcf1520e123561d2043 (diff)
parent7f57579b473749ce9bb13fd4ca25ec0adbdf0ca0 (diff)
Merge "Temporary disable linker-namespaces"
-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);
}