Merge "Extract the jni library name" (3dcba427) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/Utils.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* 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";
		}