commit f69dd03c45a6e4ccc1f404b7e8c7fa94425818e4
author android-build-team Robot <android-build-team-robot@google.com> Sun Feb 11 08:20:49 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Feb 11 08:20:49 2018 +0000
tree 4b92f07c4dc76f1feddb9c162f2d89436682f476
parent e637b59ddc288c4dbd7699570520c4caf6066cd2
parent 5156a6f8282f7d85f879a6b9c5db31f85840fcf0

Snap for 4598635 from 5156a6f8282f7d85f879a6b9c5db31f85840fcf0 to pi-release

Change-Id: Iae99f22379d153fdab04adb582b31ba3aea46df4

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)