From ae69e5787ae9a97cdb7b9c6cb5a0ef4e45067b4a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 15 Dec 2017 14:49:55 -0800
Subject: [PATCH 1/2] 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
---
 core/Makefile  | 3 ++-
 core/config.mk | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/Makefile b/core/Makefile
index 20d14d285..6d70f26a2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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
diff --git a/core/config.mk b/core/config.mk
index e43793a6a..c82238736 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -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

From 5dcea5de76ef0edb69b5f8aa71a99be707ccb324 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 15 Dec 2017 14:52:26 -0800
Subject: [PATCH 2/2] .KATI_obsolete PRODUCT_FULL_TREBLE.

It has been broken up into subflags, and usage has been cleaned up.

Bug: 69865032
Test: can't use PRODUCT_FULL_TREBLE
Change-Id: Ia38366a30132f129d09c6f4a985402c202bace62
---
 core/main.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index 621d30974..fe178da45 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -126,6 +126,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.
@@ -198,6 +200,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