From 27aaecaf1e0602e17bee526d9e52369c79ac9cb4 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 6 Dec 2017 17:21:02 +0000 Subject: [PATCH] Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met" This reverts commit 55e17a753e1091b7fff8830d33f2a09ce37930fa. Reason for revert: Soong recognizes requirements. Bug: 62019611 Test: still PRODUCT_FULL_TREBLE true on 2017 pixel Change-Id: Id2b2186af5c9aa08e8f10ec2894f0f8d69f15d60 --- core/config.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/config.mk b/core/config.mk index f54ea5f8e..232f1d057 100644 --- a/core/config.mk +++ b/core/config.mk @@ -709,6 +709,9 @@ requirements := \ # 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) \