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

Commit 62263d99 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 4ec79727

Change-Id: I9d0dd30884e50299ef0df5b3761ed906ad3b6598
parents 81c12146 4ec79727

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 :=