commit 5156a6f8282f7d85f879a6b9c5db31f85840fcf0
author Alan Viverette <alanv@google.com> Thu Feb 08 17:21:49 2018 -0500
committer Alan Viverette <alanv@google.com> Thu Feb 08 22:43:23 2018 +0000
tree 4b92f07c4dc76f1feddb9c162f2d89436682f476
parent 97d5dc4963c9d74c02bd956188428226578d1867

Migrate to AAPT2

Bug: 73128633
Test: m Loopback
Change-Id: I7ca9a9c0a9246bc44f58e176db8e3d9daf6d9ded

LoopbackApp/app/src/main/Android.mk

diff --git a/LoopbackApp/app/src/main/Android.mk b/LoopbackApp/app/src/main/Android.mk
index 23b50d2..d25b808 100644
--- a/LoopbackApp/app/src/main/Android.mk
+++ b/LoopbackApp/app/src/main/Android.mk
@@ -12,13 +12,11 @@
 
 LOCAL_CERTIFICATE := platform
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
-    frameworks/support/v7/appcompat/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages android.support.v4
+LOCAL_USE_AAPT2 := true
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4
 
 include $(BUILD_PACKAGE)