From e3c99016f97e4fdda206e175abbeb6676e005721 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 5 Oct 2017 13:22:30 -0700 Subject: [PATCH] Always pass --auto-add-overlay to aapt2 for aar prebuilts Bug: 64723465 Test: Build all aar prebuilts in our internal tree Change-Id: I82ef8d59d4f710b755226b2801dc65c2ccffe40c --- core/prebuilt_internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 3622c9c60..f515230e4 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -560,7 +560,7 @@ my_res_package := $(intermediates.COMMON)/package-res.apk # We needed only very few PRIVATE variables and aapt2.mk input variables. Reset the unnecessary ones. $(my_res_package): PRIVATE_AAPT2_CFLAGS := -$(my_res_package): PRIVATE_AAPT_FLAGS := --static-lib --no-static-lib-packages +$(my_res_package): PRIVATE_AAPT_FLAGS := --static-lib --no-static-lib-packages --auto-add-overlay $(my_res_package): PRIVATE_ANDROID_MANIFEST := $(intermediates.COMMON)/aar/AndroidManifest.xml $(my_res_package): PRIVATE_AAPT_INCLUDES := $(framework_res_package_export) $(my_res_package): PRIVATE_SOURCE_INTERMEDIATES_DIR :=