commit 326cd6637f2d80598cb5b40c0a09160a88e3f24a
author Alan Leung <acleung@google.com> Wed Dec 20 02:00:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 20 02:00:45 2017 +0000
tree fc441bc2464bda8c003760d39c6983c696c45521
parent 5260c8bdbce7100c349b770dec2df365e0a05d3f
parent c8ef37dfd88e39721c6f6666574ebb43613eff59

Merge "Prep D8 default instead of CompatDX in build/core"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index fcbd305..3b1c157 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 ?=))