commit ee69213ce1fb41cf07ae9354cd5b6b8dbc1d24d0
author Yo Chiang <yochiang@google.com> Tue Oct 01 02:45:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 01 02:45:31 2019 -0700
tree ba324ac068bb12b80317b5dd0704da6bbf22095f
parent cf318328a4c5bd5f95c178cd68b0ca4780a19100
parent efd0d2da0fca83b0098759a930ccff36b574f38b

Merge "Enable mainline checking for mainline_system_arm64"
am: efd0d2da0f

Change-Id: I411a4ee5c3d21e66d4bba3197234a2330a226422

target/product/mainline_system_arm64.mk

diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk
index b9ac1e3..4031371 100644
--- a/target/product/mainline_system_arm64.mk
+++ b/target/product/mainline_system_arm64.mk
@@ -14,16 +14,24 @@
 # limitations under the License.
 #
 
+#
+# All components inherited here go to system image
+#
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 $(call enforce-product-packages-exist,)
 
+# Enable mainline checking
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
+  root/init.zygote64_32.rc \
+
 PRODUCT_BUILD_CACHE_IMAGE := false
 PRODUCT_BUILD_ODM_IMAGE := false
 PRODUCT_BUILD_PRODUCT_IMAGE  := false
-PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
 PRODUCT_BUILD_RAMDISK_IMAGE := false
 PRODUCT_BUILD_SYSTEM_IMAGE := true
+PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
 PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
 PRODUCT_BUILD_USERDATA_IMAGE := false
 PRODUCT_BUILD_VENDOR_IMAGE := false