commit | ee72e7511a43009c1d03e12c7464ad4068f22152 | [log] [tgz] |
---|---|---|
author | Miao Wang <miaowang@google.com> | Tue Jan 13 11:29:30 2015 -0800 |
committer | Miao Wang <miaowang@google.com> | Tue Jan 13 11:33:42 2015 -0800 |
tree | 9de7fee645fb17296ac57aea096df0156f753761 | |
parent | d0f479caab2e008b1e2b19db6ed62716e3a14a9b [diff] |
Catch the exception if Java cannot find libRSSupportIO lib for Renderscript Compat lib. Change-Id: Ic9397dd593edc991fa5050a91c009c63fa33e352
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 8cf9861..552866d 100644 --- a/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java +++ b/v8/renderscript/java/src/android/support/v8/renderscript/RenderScript.java
@@ -1032,8 +1032,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; }