commit 0f56f197fab8d3c94df3cc76d7dfad1a50014011
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 02 16:45:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 02 16:45:36 2017 +0000
tree e3038250f7d507bb4e403b1df6c99de58208ac49
parent c30a14020d03f9b555f5e52aae219b18d3ffc69f
parent 3a0afa7f570276fc2e64e29ce49f562056843f0c

Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index eb75e5f..aec934a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -329,8 +329,8 @@
 
 # Boolean variable determining if Treble is fully enabled
 PRODUCT_FULL_TREBLE := false
-ifeq ($(PRODUCT_FULL_TREBLE_OVERRIDE),true)
-  PRODUCT_FULL_TREBLE := true
+ifneq ($(PRODUCT_FULL_TREBLE_OVERRIDE),)
+  PRODUCT_FULL_TREBLE := $(PRODUCT_FULL_TREBLE_OVERRIDE)
 else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
   #$(warning no product shipping level defined)
 else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),)