diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2010-07-20 16:20:15 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2010-07-20 16:37:12 +0900 |
| commit | debd74c67871e8ede5a1338a053da352e41243c8 (patch) | |
| tree | 2c3b0bcddcc5041360c63e559126e053e2ce3097 /java/Android.mk | |
| parent | 481a75fcfa81f0869f8e68c9f95390fb924ac2c5 (diff) | |
| download | latinime-debd74c67871e8ede5a1338a053da352e41243c8.tar.gz latinime-debd74c67871e8ede5a1338a053da352e41243c8.tar.xz latinime-debd74c67871e8ede5a1338a053da352e41243c8.zip | |
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
Diffstat (limited to 'java/Android.mk')
| -rwxr-xr-x | java/Android.mk | 9 |
1 files changed, 5 insertions, 4 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 |