commit 9f4ac2d57d6d21374ad2a585cf240aa5014d517e
author android-build-team Robot <android-build-team-robot@google.com> Wed May 03 08:39:11 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 03 08:39:11 2017 +0000
tree 598bbf761f3720a65cb0bc1f972cd1beeb520b46
parent bfdba75415a925979ee993138f947d3dd1a0b466
parent 0ee01641eaec3a7240cca0f41be9dcf50deb4a8f

release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-3968906 snap-temp-L55700000060028590

Change-Id: I52adbfe6f6a21954671ae148c915fba6263647e1

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b9ae19..2c6dda6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,10 @@
 LOCAL_CERTIFICATE := shared
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common android-support-v4 jsr305
+        android-common jsr305
+LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
+
+LOCAL_USE_AAPT2 := true
 
 # Include all the resources regardless of system supported locales
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true