commit 4097efdd93078034122f17442d5b4df675d1028a
author Yang Ni <yangni@google.com> Fri Jan 15 21:17:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 15 21:17:43 2016 +0000
tree d923c571c21849bf53185b26e3570fdb25fabff9
parent 2b35e9e8a6800de19459c4e2d77996661fe24d64
parent 4c2f5b63e935777645bb819b5e261ad5dda1796d

Avoid absolute path loading .so after M am: 405f6d6e7c am: 5ab545784d
am: 4c2f5b63e9

* commit '4c2f5b63e935777645bb819b5e261ad5dda1796d':
  Avoid absolute path loading .so after M

v8/renderscript/Android.mk

diff --git a/v8/renderscript/Android.mk b/v8/renderscript/Android.mk
index 520c8a1..d695f72 100644
--- a/v8/renderscript/Android.mk
+++ b/v8/renderscript/Android.mk
@@ -24,7 +24,7 @@
 LOCAL_CFLAGS += -std=c++11
 
 LOCAL_MODULE := android-support-v8-renderscript
-LOCAL_SDK_VERSION := 22
+LOCAL_SDK_VERSION := 23
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 LOCAL_JAVA_LIBRARIES := android-support-annotations
 

v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java

diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java b/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
index 34e9dd8..9c5e150 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
@@ -1343,9 +1343,10 @@
                     sUseGCHooks = false;
                 }
                 try {
-                    // For API 9+, always use the absolute path of librsjni.so
-                    // Bug: 25226912
-                    if (rs.mNativeLibDir != null) {
+                    // For API 9 - 22, always use the absolute path of librsjni.so
+                    // http://b/25226912
+                    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M &&
+                        rs.mNativeLibDir != null) {
                         System.load(rs.mNativeLibDir + "/librsjni.so");
                     } else {
                         System.loadLibrary("rsjni");
@@ -1376,9 +1377,10 @@
         }
 
         String rssupportPath = null;
-        // For API 9+, always use the absolute path of libRSSupport.so
-        // Bug: 25226912
-        if (rs.mNativeLibDir != null) {
+        // For API 9 - 22, always use the absolute path of libRSSupport.so
+        // http://b/25226912
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M &&
+            rs.mNativeLibDir != null) {
             rssupportPath = rs.mNativeLibDir + "/libRSSupport.so";
         }
         if (!rs.nLoadSO(useNative, dispatchAPI, rssupportPath)) {
@@ -1387,7 +1389,8 @@
                 useNative = false;
             }
             try {
-                if (rs.mNativeLibDir != null) {
+                if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M &&
+                    rs.mNativeLibDir != null) {
                     System.load(rssupportPath);
                 } else {
                     System.loadLibrary("RSSupport");