commit 7d82c53db7840b43fa9df990a40e38d18a39a2c2
author Seigo Nonaka <nona@google.com> Fri Apr 21 10:22:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 21 10:22:59 2017 +0000
tree d5796538f8a5973d8da24b70ab4ac449762e4e02
parent 590c3858ad8aa2289d574394e6d0f6ee3050cd2a
parent 51adb19e94d9c7b0918f8aba644694ad3ebc4ae9

Fix build Launcher2
am: 51adb19e94

Change-Id: Icd056b362ec8f7882d3be53df0a2e75a3cf9b654

Android.mk

diff --git a/Android.mk b/Android.mk
index 90c35ca..0f24b22 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,10 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))