p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add PRODUCT_FULL_TREBLE." am: 5236e11c54 am: 848e9430bc 

am: e1de7cd45a

Change-Id: I335f68e8d49538a7539cfb2e751d2c34cb52e260
This commit is contained in:
Steven Moreland 2017-03-02 04:49:28 +00:00 committed by android-build-merger
parent 8c86bc72b4 e1de7cd45a
commit 5a9cfecc85
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

@ -3250,6 +3250,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

@ -349,6 +349,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