Prepare for master merge
- Rename the jni library name
- Revert the local cert
- LatinIme2Google -> LatinIME
Please note that we'll use the new package name: com.google.android.inputmethod.latin
Change-Id: Ibbab07e8102ade5a93660c0723cd86f600c14a7d
diff --git a/java/Android.mk b/java/Android.mk
index 172f35a..c89e1c6 100755
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -5,17 +5,18 @@
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