commit 4b5c0562162eee8e607cdaf20487969e1d41e1a8
author Steven Moreland <smoreland@google.com> Tue Dec 19 20:37:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 19 20:37:50 2017 +0000
tree 42018ab3b5399a94ef86ee0af4dae7beacd8532d
parent 54c54f5eb5a4057f35b4c149cd6d609864f3ce39
parent eba55d25157ba2a0a6acbfa87c5668993d9a9c3a

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

Change-Id: I16e095971a1b56e59b1efa6f6e1551fb224d9655

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 15336ad..8a4e835 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -764,6 +764,9 @@
 # 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 ?=))