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

Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810 

am: a710d44086

Change-Id: I39b94bef18b12f0e55bc1d0eaabde2ba85f00146
This commit is contained in:
Steven Moreland 2017-12-18 17:57:42 +00:00 committed by android-build-merger
parent 892e4d3ec9 a710d44086
commit 9874ee6c54
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@ -841,7 +841,8 @@ installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz
tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt
tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html
ifeq ($(PRODUCT_FULL_TREBLE),true)
# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior.
ifeq ($(PRODUCT_NOTICE_SPLIT),true)
target_notice_file_html_or_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml
target_notice_file_html_or_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz
installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz

7
core/config.mk
View File

@ -748,10 +748,17 @@ else ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),26),)
PRODUCT_FULL_TREBLE := true
endif
# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior and remove
# references to it here and below.
ifdef PRODUCT_NOTICE_SPLIT_OVERRIDE
$(error PRODUCT_NOTICE_SPLIT_OVERRIDE cannot be set.)
endif
requirements := \
PRODUCT_TREBLE_LINKER_NAMESPACES \
PRODUCT_SEPOLICY_SPLIT \
PRODUCT_ENFORCE_VINTF_MANIFEST \
PRODUCT_NOTICE_SPLIT
# If it is overriden, then the requirement override is taken, otherwise it's
# PRODUCT_FULL_TREBLE

7
core/main.mk
View File

@ -128,6 +128,8 @@ ifneq ($(ADDITIONAL_BUILD_PROPERTIES),)
$(error ADDITIONAL_BUILD_PROPERTIES must not be set before here: $(ADDITIONAL_BUILD_PROPERTIES))
endif
ADDITIONAL_BUILD_PROPERTIES :=
#
# -----------------------------------------------------------------
# Add the product-defined properties to the build properties.
@ -200,6 +202,11 @@ endif
ADDITIONAL_BUILD_PROPERTIES += ro.treble.enabled=${PRODUCT_FULL_TREBLE}
$(KATI_obsolete_var PRODUCT_FULL_TREBLE,\
Code should be written to work regardless of a device being Treble or \
variables like PRODUCT_SEPOLICY_SPLIT should be used until that is \
possible.)
# -----------------------------------------------------------------
###
### In this section we set up the things that are different