diff --git a/core/definitions.mk b/core/definitions.mk index 56176cafd..a179df4d0 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -3243,6 +3243,14 @@ endef #$(warning 42 == $(call math_max,5,42)) #$(warning 42 == $(call math_max,42,5)) +define math_gt_or_eq +$(if $(filter $(1),$(call math_max,$(1),$(2))),true) +endef + +#$(warning $(call math_gt_or_eq, 2, 1)) +#$(warning $(call math_gt_or_eq, 1, 1)) +#$(warning $(if $(call math_gt_or_eq, 1, 2),false,true)) + # $1 is the variable name to increment define inc_and_print $(strip $(eval $(1) := $($(1)) .)$(words $($(1)))) diff --git a/core/main.mk b/core/main.mk index 739fc11b6..7433f9076 100644 --- a/core/main.mk +++ b/core/main.mk @@ -343,6 +343,16 @@ ifneq ($(PLATFORM_VERSION_CODENAME),REL) ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1 endif +# Boolean variable determining if Treble is fully enabled +PRODUCT_FULL_TREBLE := false +ifeq ($(PRODUCT_FULL_TREBLE_OVERRIDE),true) + PRODUCT_FULL_TREBLE := true +else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),) + #$(warning no product shipping level defined) +else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),) + PRODUCT_FULL_TREBLE := true +endif + # ----------------------------------------------------------------- ### ### In this section we set up the things that are different