Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" (4ec79727) · Commits · e / os / android_build

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