Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a1ba2e8 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false." am: 0f56f197 am: 05e43e60 

am: 28a13d0d

Change-Id: I72ed2d7ebbd7077d2377b4f0aa44ee8b0203cf56
parents dfffda92 28a13d0d

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,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),)