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

Commit f39752e9 authored by Ying Wang's avatar Ying Wang
Browse files

Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS 

Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
parent 7503e736

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ 
    $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \

    $(addprefix --min-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --target-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS)) \

    $(if $(filter --product,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS))) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \

    $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \