From acb3084aa26b5d72095bcc6d20005868e6b3b962 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 17 Dec 2018 18:19:33 +0000 Subject: [PATCH] Allow mainline_arm64 to have product contents The device currently targeted does not have a product partition. Adding product-specific apps to it therefore trips up the artifact path check for /system. Workaround that by whitelisting /system/product/% for now. This should be removed when the device has the right partitions. Bug: 110072687 Test: build mainline_arm64 Merged-In: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab --- target/product/mainline_arm64.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index cc048442f6..f93d7e412b 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -25,8 +25,10 @@ PRODUCT_BRAND := generic PRODUCT_SHIPPING_API_LEVEL := 28 PRODUCT_RESTRICT_VENDOR_FILES := all -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \ +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +# Target device doesn't have a product partition, so whitelist the /system/ fallback path. +PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := system/product/% +PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ root/init.zygote64_32.rc \ system/etc/seccomp_policy/crash_dump.arm.policy \ system/etc/seccomp_policy/mediacodec.policy \