diff options
| -rwxr-xr-x | java/Android.mk | 9 | ||||
| -rwxr-xr-x | java/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionary.java | 4 | ||||
| -rw-r--r-- | native/Android.mk | 8 | ||||
| -rw-r--r-- | tests/Android.mk | 4 |
5 files changed, 13 insertions, 18 deletions
diff --git a/java/Android.mk b/java/Android.mk index 172f35a89..c89e1c6bb 100755 --- a/java/Android.mk +++ b/java/Android.mk @@ -5,17 +5,18 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := LatinIme2Google +LOCAL_PACKAGE_NAME := LatinIME -LOCAL_CERTIFICATE := vendor/google/certs/app +LOCAL_CERTIFICATE := shared -LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2 +LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime LOCAL_STATIC_JAVA_LIBRARIES := android-common #LOCAL_AAPT_FLAGS := -0 .dict # The following flag is required because we use a different package name -# com.google.android.inputmethod.latin in the LatinIME sandbox. +# com.google.android.inputmethod.latin than Java package name +# com.android.inputmethod.latin LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin LOCAL_SDK_VERSION := 8 diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index d14ca32e5..f87ce013b 100755 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -1,9 +1,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.inputmethod.latin" - android:versionCode="21" - android:versionName="0.21"> - - <uses-sdk android:minSdkVersion="8"></uses-sdk> + package="com.google.android.inputmethod.latin"> <original-package android:name="com.android.inputmethod.latin" /> diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index a1e9adf2e..0a2af0662 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -53,9 +53,9 @@ public class BinaryDictionary extends Dictionary { static { try { - System.loadLibrary("jni_latinime2"); + System.loadLibrary("jni_latinime"); } catch (UnsatisfiedLinkError ule) { - Log.e("BinaryDictionary", "Could not load native library jni_latinime2"); + Log.e("BinaryDictionary", "Could not load native library jni_latinime"); } } diff --git a/native/Android.mk b/native/Android.mk index de4f7eb01..6bad9d638 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(JNI_H_INCLUDE) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/src LOCAL_SRC_FILES := \ jni/com_android_inputmethod_latin_BinaryDictionary.cpp \ @@ -16,10 +16,8 @@ else LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) endif -LOCAL_PRELINK_MODULE := false +LOCAL_MODULE := libjni_latinime -LOCAL_MODULE := libjni_latinime2 - -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := user include $(BUILD_SHARED_LIBRARY) diff --git a/tests/Android.mk b/tests/Android.mk index 60e82d5c2..fba7a8d74 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -10,8 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := LatinIME2Tests +LOCAL_PACKAGE_NAME := LatinIMETests -LOCAL_INSTRUMENTATION_FOR := LatinIme2Google +LOCAL_INSTRUMENTATION_FOR := LatinIME include $(BUILD_PACKAGE) |