aboutsummaryrefslogtreecommitdiffstats
path: root/java/Android.mk
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-16 01:05:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-16 01:05:09 +0000
commit3ac57504cd087083865cb47fd0c295ebd6caf747 (patch)
treee6592087fe175604a95ba5e9eb034f350bb990f7 /java/Android.mk
parentadd95c01b9d4d69ab22a7524309aa2e13f0ee873 (diff)
parentaf1177453d95d727651cf48a380d7979dc94ae45 (diff)
downloadlatinime-3ac57504cd087083865cb47fd0c295ebd6caf747.tar.gz
latinime-3ac57504cd087083865cb47fd0c295ebd6caf747.tar.xz
latinime-3ac57504cd087083865cb47fd0c295ebd6caf747.zip
Merge "Revert "Use AAPT2"" into oc-dev
Diffstat (limited to 'java/Android.mk')
-rw-r--r--java/Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/java/Android.mk b/java/Android.mk
index 154f3a20c..b84b3471e 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,12 +26,7 @@ LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-common inputmethod-common jsr305 latinime-common
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v4
-
-LOCAL_USE_AAPT2 := true
+ android-common inputmethod-common android-support-v4 jsr305 latinime-common
# Do not compress dictionary files to mmap dict data runtime
LOCAL_AAPT_FLAGS := -0 .dict