Merge "Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met""

am: eba55d2515

Change-Id: I16e095971a1b56e59b1efa6f6e1551fb224d9655
This commit is contained in:
Steven Moreland 2017-12-19 20:37:50 +00:00 committed by android-build-merger
commit 4b5c056216
1 changed files with 3 additions and 0 deletions

View File

@ -764,6 +764,9 @@ requirements := \
# PRODUCT_FULL_TREBLE
$(foreach req,$(requirements),$(eval \
$(req) := $(if $($(req)_OVERRIDE),$($(req)_OVERRIDE),$(PRODUCT_FULL_TREBLE))))
# If the requirement is false for any reason, then it's not PRODUCT_FULL_TREBLE
$(foreach req,$(requirements),$(eval \
PRODUCT_FULL_TREBLE := $(if $(filter false,$($(req))),false,$(PRODUCT_FULL_TREBLE))))
PRODUCT_FULL_TREBLE_OVERRIDE ?=
$(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=))