aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-05-17 22:54:28 +0000
committerAdam Lesinski <adamlesinski@google.com>2017-05-17 22:54:28 +0000
commit8c210e394876239b23a22be24c0f2d2be4b678c2 (patch)
treed29f7532042393095473188e2889f0ca49c50fc5
parentaf1177453d95d727651cf48a380d7979dc94ae45 (diff)
downloadlatinime-8c210e394876239b23a22be24c0f2d2be4b678c2.tar.gz
latinime-8c210e394876239b23a22be24c0f2d2be4b678c2.tar.xz
latinime-8c210e394876239b23a22be24c0f2d2be4b678c2.zip
Revert "Revert "Use AAPT2""
This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22
-rw-r--r--java/Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk
index b84b3471e..154f3a20c 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,7 +26,12 @@ LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-common inputmethod-common android-support-v4 jsr305 latinime-common
+ android-common inputmethod-common jsr305 latinime-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-v4
+
+LOCAL_USE_AAPT2 := true
# Do not compress dictionary files to mmap dict data runtime
LOCAL_AAPT_FLAGS := -0 .dict