Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false."

am: 0f56f197fa

Change-Id: Ib62676222012092e2de1736d1004ae68647ead9f
This commit is contained in:
Steven Moreland 2017-05-02 16:52:34 +00:00 committed by android-build-merger
commit 05e43e6005

View file

@ -329,8 +329,8 @@ endif
# 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),)