diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-06 19:21:08 +0100 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-28 13:56:59 -0700 |
| commit | 246594607348bd241caa9d92aeafe4ac7b279029 (patch) | |
| tree | 04ded759fa4c40581ccfb2ff4c3fe86c4ddd944d | |
| parent | e419d2e46903aa9ada21fcc5673d41c2a254f3f3 (diff) | |
| download | android_packages_inputmethods_LatinIME-246594607348bd241caa9d92aeafe4ac7b279029.tar.gz android_packages_inputmethods_LatinIME-246594607348bd241caa9d92aeafe4ac7b279029.tar.bz2 android_packages_inputmethods_LatinIME-246594607348bd241caa9d92aeafe4ac7b279029.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
| -rw-r--r-- | java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/JniUtils.java | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java b/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java index abfc36d39..83ed5eba3 100644 --- a/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java +++ b/java-overridable/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_latinimegoogle"; } diff --git a/java/src/com/android/inputmethod/latin/utils/JniUtils.java b/java/src/com/android/inputmethod/latin/utils/JniUtils.java index e7fdafaeb..fe9c860de 100644 --- a/java/src/com/android/inputmethod/latin/utils/JniUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/JniUtils.java @@ -25,9 +25,14 @@ 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) { + Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME2, ue); + try { + System.loadLibrary(JniLibName.JNI_LIB_NAME); + } catch (UnsatisfiedLinkError ule) { + Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME, ule); + } } } |