commit ad9ee4b5042acd3512c07bafce35f46d8de691cd
author Anton Hansson <hansson@google.com> Mon Jan 28 10:49:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 28 10:49:32 2019 +0000
tree d6d4c3e4dda6fd583f1b2962bf8019504b3150b3
parent 8fbdd25457fb50c2f017d49dee47ec96d39d063d
parent 14fb72c15c374acd723c9b243bc962f5dedcb86c

Merge "Move mainline_arm64 over to use mainline device"

target/product/mainline_arm64.mk

diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk
index 904bd26..9391072 100644
--- a/target/product/mainline_arm64.mk
+++ b/target/product/mainline_arm64.mk
@@ -18,14 +18,12 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk)
 
 PRODUCT_NAME := mainline_arm64
-PRODUCT_DEVICE := generic_arm64
+PRODUCT_DEVICE := mainline_arm64
 PRODUCT_BRAND := generic
 PRODUCT_SHIPPING_API_LEVEL := 28
 PRODUCT_RESTRICT_VENDOR_FILES := all
 
 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 \