diff options
| author | Colin Cross <ccross@android.com> | 2019-07-08 14:09:32 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2019-08-07 07:00:06 -0700 |
| commit | c41a28cb1cb2a52784f777178dac25d038852f27 (patch) | |
| tree | 0ce870345757c7a24f975ce66df6176bc52b13f5 | |
| parent | 6f6d78bace5c886a75526a244b1d31f9999a052b (diff) | |
| download | build-c41a28cb1cb2a52784f777178dac25d038852f27.tar.gz | |
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
| -rw-r--r-- | target/product/mainline_arm64.mk | 3 | ||||
| -rw-r--r-- | 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 |