Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false."

This commit is contained in:
Treehugger Robot 2017-05-02 16:45:34 +00:00 committed by Gerrit Code Review
commit 0f56f197fa
1 changed files with 2 additions and 2 deletions

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),)