diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-06 19:21:08 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 22:09:38 +0200 |
| commit | f22d9dfc165dd6d6f473bcf184c414855ea0425f (patch) | |
| tree | 0370fcf3758579e7cc2d40d434188b66602a734a | |
| parent | 3ae26de593f8a0a140b93cbd0b46a1feb28ff105 (diff) | |
| download | android_packages_inputmethods_LatinIME-f22d9dfc165dd6d6f473bcf184c414855ea0425f.tar.gz android_packages_inputmethods_LatinIME-f22d9dfc165dd6d6f473bcf184c414855ea0425f.tar.bz2 android_packages_inputmethods_LatinIME-f22d9dfc165dd6d6f473bcf184c414855ea0425f.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 | 10 |
2 files changed, 8 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..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); + } } } |