diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-07 20:09:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-12-07 20:09:32 +0000 |
| commit | 03085ba41c6a14a607259670ff6760674525660d (patch) | |
| tree | 7da3dd728a34d39aaea8262462969a28932ffb29 /java | |
| parent | e4475239272c4c3f48683a0b89100039da6a67bc (diff) | |
| parent | 3126974e232ec394269f16c663a72259c46fda29 (diff) | |
| download | android_packages_inputmethods_LatinIME-03085ba41c6a14a607259670ff6760674525660d.tar.gz android_packages_inputmethods_LatinIME-03085ba41c6a14a607259670ff6760674525660d.tar.bz2 android_packages_inputmethods_LatinIME-03085ba41c6a14a607259670ff6760674525660d.zip | |
Merge "LatinIME: Add fallback loader for JNI lib" into cm-11.0
Diffstat (limited to 'java')
| -rw-r--r-- | java/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/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"; } 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); + } } } |