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

This commit is contained in:
Treehugger Robot 2017-12-19 20:32:34 +00:00 committed by Gerrit Code Review
commit eba55d2515
1 changed files with 3 additions and 0 deletions

View File

@ -764,6 +764,9 @@ requirements := \
# PRODUCT_FULL_TREBLE # PRODUCT_FULL_TREBLE
$(foreach req,$(requirements),$(eval \ $(foreach req,$(requirements),$(eval \
$(req) := $(if $($(req)_OVERRIDE),$($(req)_OVERRIDE),$(PRODUCT_FULL_TREBLE)))) $(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 ?= PRODUCT_FULL_TREBLE_OVERRIDE ?=
$(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=)) $(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=))