commit ad9feb4cac7f1fd3e8230e3e61cb23630a93919d
author Jiyong Park <jiyong@google.com> Wed Nov 15 01:27:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 15 01:27:56 2017 +0000
tree 2650889dcd11f09e2e71b9413255ca638deef5ea
parent 44dd4881defd4589fad6fdd8596d6bc6f3f9dfb5
parent 8a89848373b20aad2c49d1e963551da7b8eb8752

Merge "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met"
am: 8a89848373

Change-Id: If19df9e3560456c2f69e2faa54fe3cbbb1c045cb

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 96cc7b7..9983590 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -716,9 +716,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) \