diff options
| author |   satok <satok@google.com> | 2011-12-13 00:46:16 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-12-13 00:46:16 -0800 |
| commit | 3dcba4279a9e663d040330fe13b6ce3ecd0ca879 (patch) | |
| tree | 9d76d36309455546cf7d4fce0ce4268ca3d06c57 /java/src/com/android/inputmethod/latin/Utils.java | |
| parent | 77ecf52a082143ef65fa2de1ca4425ec32ad8cd0 (diff) | |
| parent | ba526e3157e04cbfa5a6183ec14a5d01dd3c9b10 (diff) | |
| download | latinime-3dcba4279a9e663d040330fe13b6ce3ecd0ca879.tar.gz latinime-3dcba4279a9e663d040330fe13b6ce3ecd0ca879.tar.xz latinime-3dcba4279a9e663d040330fe13b6ce3ecd0ca879.zip | |
Merge "Extract the jni library name"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Utils.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Utils.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index de29e8f74..64f4d058b 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -22,6 +22,7 @@ import com.android.inputmethod.compat.InputMethodSubtypeCompatWrapper; import com.android.inputmethod.compat.InputTypeCompatUtils; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardId; +import com.android.inputmethod.latin.define.JniLibName; import android.content.Context; import android.content.Intent; @@ -691,9 +692,13 @@ public class Utils { public static void loadNativeLibrary() { try { - System.loadLibrary("jni_latinime"); + System.loadLibrary(JniLibName.JNI_LIB_NAME); } catch (UnsatisfiedLinkError ule) { - Log.e(TAG, "Could not load native library jni_latinime"); + Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME); + if (LatinImeLogger.sDBG) { + throw new RuntimeException( + "Could not load native library " + JniLibName.JNI_LIB_NAME); + } } } |