PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE

- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
  doesn't need to be differentiated.

Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
This commit is contained in:
Steven Moreland
2017-12-15 14:49:55 -08:00
parent 4b7ab33f4e
commit ae69e5787a
2 changed files with 9 additions and 1 deletions

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

View File

@@ -747,10 +747,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