summaryrefslogtreecommitdiffstats
path: root/java/src/com
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-06 19:21:08 +0100
committerRicardo Cerqueira <ricardo@cyngn.com>2015-10-29 23:55:18 +0000
commit93c10bd3665ba012243b78080a54552d8440493c (patch)
treef641eb7e5e69fcf0f57d21f8a63505bf7d60f68c /java/src/com
parent00abb42cbcd0d55712f09c3b465ccff12518dfba (diff)
downloadandroid_packages_inputmethods_LatinIME-93c10bd3665ba012243b78080a54552d8440493c.tar.gz
android_packages_inputmethods_LatinIME-93c10bd3665ba012243b78080a54552d8440493c.tar.bz2
android_packages_inputmethods_LatinIME-93c10bd3665ba012243b78080a54552d8440493c.zip
LatinIME: Add fallback loader for JNI lib
Prefer the JNI lib with gesture typing support. If not available / installed fall back to the standard one without geture typing. Change-Id: I70a5f43386a9c72809a70bd286f3702378d6f9be
Diffstat (limited to 'java/src/com')
-rw-r--r--java/src/com/android/inputmethod/latin/utils/JniUtils.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/JniUtils.java b/java/src/com/android/inputmethod/latin/utils/JniUtils.java
index e7fdafaeb..0e4f582cb 100644
--- a/java/src/com/android/inputmethod/latin/utils/JniUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/JniUtils.java
@@ -25,9 +25,13 @@ public final class JniUtils {
static {
try {
- System.loadLibrary(JniLibName.JNI_LIB_NAME);
- } catch (UnsatisfiedLinkError ule) {
- Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME, ule);
+ System.loadLibrary(JniLibName.JNI_LIB_NAME2);
+ } catch (UnsatisfiedLinkError ue) {
+ try {
+ System.loadLibrary(JniLibName.JNI_LIB_NAME);
+ } catch (UnsatisfiedLinkError ule) {
+ Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME, ule);
+ }
}
}