commit 6416ca9394a0f946f216fce94d5b3376ddd49e16
author Miao Wang <miaowang@google.com> Sat Jan 24 00:12:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 24 00:12:46 2015 +0000
tree f1fa2b17a0d9b32fcbc64c12a84892a239ffe011
parent a63f49471224937f443028afb0921f53aad196b6
parent 3d9b60c9ae71c4c09df0b4e59c825a5d631e1254

Merge "Required 64bit changes for JNI/Java for RS compat lib."

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 b42b097..b7c9b85 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
@@ -1059,8 +1059,12 @@
         }
 
         if (useIOlib) {
-            System.loadLibrary("RSSupportIO");
-            if (!rs.nLoadIOSO()) {
+            try {
+                System.loadLibrary("RSSupportIO");
+            } catch (UnsatisfiedLinkError e) {
+                useIOlib = false;
+            }
+            if (!useIOlib || !rs.nLoadIOSO()) {
                 android.util.Log.v(LOG_TAG, "Unable to load libRSSupportIO.so, USAGE_IO not supported");
                 useIOlib = false;
             }