Merge "[RenderScript] Add additional check for determining whether to use native RS."

Author: miaowang14

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 := 19
+LOCAL_SDK_VERSION := 21
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
 include $(BUILD_STATIC_JAVA_LIBRARY)

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

@@ -65,7 +65,7 @@ public class RenderScript {
     static Object lock = new Object();
 
     // Non-threadsafe functions.
-    native boolean nLoadSO(boolean useNative);
+    native boolean nLoadSO(boolean useNative, int deviceApi);
     native boolean nLoadIOSO();
     native long nDeviceCreate();
     native void nDeviceDestroy(long dev);
@@ -95,6 +95,13 @@ boolean isUseNative() {
      * RenderScript layer or actually using the compatibility library.
      */
     static private boolean setupNative(int sdkVersion, Context ctx) {
+        // if targetSdkVersion is higher than the device api version, always use compat mode.
+        // Workaround for KK
+        if (android.os.Build.VERSION.SDK_INT < sdkVersion &&
+            android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
+            sNative = 0;
+        }
+
         if (sNative == -1) {
 
             // get the value of the debug.rs.forcecompat property
@@ -1176,7 +1183,7 @@ public static RenderScript create(Context ctx, int sdkVersion, ContextType ct) {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             useIOlib = true;
         }
-        if (!rs.nLoadSO(useNative)) {
+        if (!rs.nLoadSO(useNative, android.os.Build.VERSION.SDK_INT)) {
             if (useNative) {
                 android.util.Log.v(LOG_TAG, "Unable to load libRS.so, falling back to compat mode");
                 useNative = false;
@@ -1187,7 +1194,7 @@ public static RenderScript create(Context ctx, int sdkVersion, ContextType ct) {
                 Log.e(LOG_TAG, "Error loading RS Compat library: " + e);
                 throw new RSRuntimeException("Error loading RS Compat library: " + e);
             }
-            if (!rs.nLoadSO(false)) {
+            if (!rs.nLoadSO(false, android.os.Build.VERSION.SDK_INT)) {
                 throw new RSRuntimeException("Error loading libRSSupport library");
             }
         }

v8/renderscript/jni/android_renderscript_RenderScript.cpp

@@ -269,7 +269,7 @@ static dispatchTable dispatchTab;
 // Incremental Support lib
 static dispatchTable dispatchTabInc;
 
-static jboolean nLoadSO(JNIEnv *_env, jobject _this, jboolean useNative) {
+static jboolean nLoadSO(JNIEnv *_env, jobject _this, jboolean useNative, jint deviceApi) {
     void* handle = NULL;
     if (useNative) {
         handle = dlopen("libRS.so", RTLD_LAZY | RTLD_LOCAL);
@@ -281,7 +281,7 @@ static jboolean nLoadSO(JNIEnv *_env, jobject _this, jboolean useNative) {
         return false;
     }
 
-    if (loadSymbols(handle, dispatchTab) == false) {
+    if (loadSymbols(handle, dispatchTab, deviceApi) == false) {
         LOG_API("%s init failed!", filename);
         return false;
     }
@@ -1601,7 +1601,7 @@ nIncAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong incCon,
 static const char *classPathName = "android/support/v8/renderscript/RenderScript";
 
 static JNINativeMethod methods[] = {
-{"nLoadSO",                        "(Z)Z",                                    (bool*)nLoadSO },
+{"nLoadSO",                        "(ZI)Z",                                   (bool*)nLoadSO },
 {"nLoadIOSO",                      "()Z",                                     (bool*)nLoadIOSO },
 {"nDeviceCreate",                  "()J",                                     (void*)nDeviceCreate },
 {"nDeviceDestroy",                 "(J)V",                                    (void*)nDeviceDestroy },