From 7f57579b473749ce9bb13fd4ca25ec0adbdf0ca0 Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Mon, 14 Dec 2015 09:57:56 -0800
Subject: [PATCH] Temporary disable linker-namespaces

Bug: http://b/26178910
Bug: http://b/26165097
Change-Id: I858c70dc72ec164ea7a79ad625ddda91367dae06
---
 runtime/native/java_lang_Runtime.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/native/java_lang_Runtime.cc b/runtime/native/java_lang_Runtime.cc
index ff8277217..4a1e6c21c 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);
   }
 
-- 
2.11.0