diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-08-06 16:04:07 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-08-06 16:04:07 +0900 |
| commit | 44456dcbf23c29b54e9372d932b79805957724cb (patch) | |
| tree | a8167c70e9d7017f212066cf2364d1ad5b09fdca /java/Android.mk | |
| parent | 07e4f9eb530a795efd97986e28546c8c5e895c72 (diff) | |
| parent | d299bde24b4afd3955fa65c7ab372807a336c6df (diff) | |
| download | latinime-44456dcbf23c29b54e9372d932b79805957724cb.tar.gz latinime-44456dcbf23c29b54e9372d932b79805957724cb.tar.xz latinime-44456dcbf23c29b54e9372d932b79805957724cb.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
java/res/values-af/strings.xml
java/res/values-cs/strings.xml
java/res/values-et/strings.xml
java/res/values-fi/strings.xml
java/res/values-hi/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-in/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-lt/strings.xml
java/res/values-lv/strings.xml
java/res/values-ms/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sk/strings.xml
java/res/values-sl/strings.xml
java/res/values-sr/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-vi/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
Change-Id: Ib4141aca0b35148d62d22d4f32309f890c84303a
Diffstat (limited to 'java/Android.mk')
| -rw-r--r-- | java/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/Android.mk b/java/Android.mk index 52cc18b26..364973bea 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -28,9 +28,7 @@ LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime # We want to install libjni_latinime.so to the system partition if LatinIME gets installed. LOCAL_REQUIRED_MODULES := libjni_latinime -LOCAL_STATIC_JAVA_LIBRARIES := android-common -LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +LOCAL_STATIC_JAVA_LIBRARIES := android-common inputmethod-common android-support-v4 # Do not compress dictionary files to mmap dict data runtime LOCAL_AAPT_FLAGS := -0 .dict |