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

Commit 78a819d6 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS 

* commit '266cf4f2':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
parents 37f3c5cc 266cf4f2

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,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)) \