diff options
| author | Yang Ni <yangni@google.com> | 2016-01-15 21:17:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 21:17:43 +0000 |
| commit | 4097efdd93078034122f17442d5b4df675d1028a (patch) | |
| tree | d923c571c21849bf53185b26e3570fdb25fabff9 | |
| parent | 2b35e9e8a6800de19459c4e2d77996661fe24d64 (diff) | |
| parent | 4c2f5b63e935777645bb819b5e261ad5dda1796d (diff) | |
| download | android_frameworks_support-4097efdd93078034122f17442d5b4df675d1028a.tar.gz android_frameworks_support-4097efdd93078034122f17442d5b4df675d1028a.tar.bz2 android_frameworks_support-4097efdd93078034122f17442d5b4df675d1028a.zip | |
Avoid absolute path loading .so after M am: 405f6d6e7c am: 5ab545784d
am: 4c2f5b63e9
* commit '4c2f5b63e935777645bb819b5e261ad5dda1796d':
Avoid absolute path loading .so after M
| -rw-r--r-- | v8/renderscript/Android.mk | 2 | ||||
| -rw-r--r-- | v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/v8/renderscript/Android.mk b/v8/renderscript/Android.mk index 520c8a1893..d695f72ba6 100644 --- a/v8/renderscript/Android.mk +++ b/v8/renderscript/Android.mk @@ -24,7 +24,7 @@ include $(CLEAR_VARS) 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 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 34e9dd886e..9c5e150744 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 @@ public class RenderScript { 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 @@ public class RenderScript { } 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 @@ public class RenderScript { 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"); |