Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c99016 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Always pass --auto-add-overlay to aapt2 for aar prebuilts 

Bug: 64723465
Test: Build all aar prebuilts in our internal tree
Change-Id: I82ef8d59d4f710b755226b2801dc65c2ccffe40c
parent f68eea33

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 :=