commit 025a33726b6256916c355ca57ad2745b2101578b
author Justin Yun <justinyun@google.com> Tue Oct 29 16:16:38 2019 +0900
committer Yo Chiang <yochiang@google.com> Thu May 21 14:56:40 2020 +0800
tree 9d9f217675ac7e88f2d301bae22565eeea7f9e64
parent ebbfdbfe305c7bf057282d65c7577229cb6ba9f3

Set floal mainline enforcement 'strict'

As we cleared mainline whitelist, set the enforcement to 'strict'

Bug: 143121605
Bug: 140912362
Test: build aosp_(coral|flame)
Change-Id: I2653475ca2b27ed5a82f79e77d3a513d5c6742e7
Merged-In: I2653475ca2b27ed5a82f79e77d3a513d5c6742e7
(cherry picked from commit b7f3ee5b0bcc264ffed86acaad4b912b041584af)

aosp_coral.mk

diff --git a/aosp_coral.mk b/aosp_coral.mk
index 1483213..44b5819 100644
--- a/aosp_coral.mk
+++ b/aosp_coral.mk
@@ -21,10 +21,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
-    root/init.zygote64_32.rc \
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
 
 #
 # All components inherited here go to product image

aosp_flame.mk

diff --git a/aosp_flame.mk b/aosp_flame.mk
index 015622d..c04d122 100644
--- a/aosp_flame.mk
+++ b/aosp_flame.mk
@@ -21,10 +21,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
-    root/init.zygote64_32.rc \
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
 
 #
 # All components inherited here go to product image