commit 905c84cada1b5119ba50bec71b91905ab99e003c
author Tao Bao <tbao@google.com> Wed Nov 15 18:15:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 15 18:15:20 2017 +0000
tree 1905698cd7fe4768fadacb9d454d9dad2ed539d9
parent 8a89848373b20aad2c49d1e963551da7b8eb8752
parent 9dd909e6db2bf143dcc9369155389a48a1b427bc

Merge "releasetools: Fix the size check for AVB images."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 232f1d0..f54ea5f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -709,9 +709,6 @@
 # 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))))
 
 .KATI_READONLY := \
     $(requirements) \