tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add PRODUCT_FULL_TREBLE." am: 5236e11c54

Browse source 
am: 848e9430bc

Change-Id: Icb27d3a034695ea4367286cf288e460e2feec76e
This commit is contained in:
Steven Moreland 2017-03-02 04:44:58 +00:00 committed by android-build-merger
commit e1de7cd45a
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/definitions.mk
View file

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

10
core/main.mk
View file

@ -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