nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3dcba427: Merge "Extract the jni library name" 

* commit '3dcba4279a9e663d040330fe13b6ce3ecd0ca879':
  Extract the jni library name
main
satok 2011-12-13 05:48:25 -08:00 committed by Android Git Automerger
parent de5a858e2c 3dcba4279a
commit 1568fadcb7
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/Utils.java
View File

@ -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);
}
}
}

21
java/src/com/android/inputmethod/latin/define/JniLibName.java Normal file
View File

@ -0,0 +1,21 @@
/*
* Copyright (C) 2011 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.android.inputmethod.latin.define;
public class JniLibName {
public static final String JNI_LIB_NAME = "jni_latinime";
}