diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-11-05 14:36:11 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-11-05 14:36:11 -0800 |
| commit | 44d5dcc7d72148d0be272260922554a426e7f1e4 (patch) | |
| tree | d08d9c052b226c17c779765e898a968c1892ee55 | |
| parent | 19bfc6e1511d905409c26a7e553716a7862fd2e5 (diff) | |
| download | android_packages_inputmethods_LatinIME-44d5dcc7d72148d0be272260922554a426e7f1e4.tar.gz android_packages_inputmethods_LatinIME-44d5dcc7d72148d0be272260922554a426e7f1e4.tar.bz2 android_packages_inputmethods_LatinIME-44d5dcc7d72148d0be272260922554a426e7f1e4.zip | |
Add fallback loadercm-10.2.0
Change-Id: Ice2619fc2332b424a89df5eda1aa6d61e6d05a07
| -rw-r--r-- | java/src/com/android/inputmethod/latin/JniUtils.java | 10 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/define/JniLibName.java | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/JniUtils.java b/java/src/com/android/inputmethod/latin/JniUtils.java index 8aedee576..76fe2c5b1 100644 --- a/java/src/com/android/inputmethod/latin/JniUtils.java +++ b/java/src/com/android/inputmethod/latin/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); + } } } diff --git a/java/src/com/android/inputmethod/latin/define/JniLibName.java b/java/src/com/android/inputmethod/latin/define/JniLibName.java index abfc36d39..0fcf7ee38 100644 --- a/java/src/com/android/inputmethod/latin/define/JniLibName.java +++ b/java/src/com/android/inputmethod/latin/define/JniLibName.java @@ -22,4 +22,5 @@ public final class JniLibName { } public static final String JNI_LIB_NAME = "jni_latinime"; + public static final String JNI_LIB_NAME2 = "jni_unbundled_latinimegoogle"; } |