From c41a28cb1cb2a52784f777178dac25d038852f27 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 8 Jul 2019 14:09:32 -0700 Subject: [PATCH] DO NOT MERGE - temporarily disable vendor file check for mainline We want to use prebuilts for apex modules for qt-*-dev, but it is running afoul of the vendor file check. Disable the check for now until we figure out a better solution. Bug: 136664286 Test: Local build and Forrest Run Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6 --- target/product/mainline_arm64.mk | 3 ++- target/product/mainline_system_arm64.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 622fe9420d..f21fa89c08 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -22,7 +22,8 @@ PRODUCT_NAME := mainline_arm64 PRODUCT_DEVICE := mainline_arm64 PRODUCT_BRAND := generic PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk index f01cc5471a..6cadf8448a 100644 --- a/target/product/mainline_system_arm64.mk +++ b/target/product/mainline_system_arm64.mk @@ -32,4 +32,5 @@ PRODUCT_NAME := mainline_system_arm64 PRODUCT_DEVICE := mainline_arm64 PRODUCT_BRAND := generic PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner