diff options
| author | Colin Cross <ccross@android.com> | 2019-07-08 14:09:32 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2019-07-09 15:36:28 -0700 |
| commit | 3f8eb7ec99b1dafbaffa098cff126e852284a704 (patch) | |
| tree | f86993af8f0231ad38a989a50000fe9a8bf4b3e3 | |
| parent | 25065c44ccce11172ad769f9f7b52aa3938109cb (diff) | |
| download | build-3f8eb7ec99b1dafbaffa098cff126e852284a704.tar.gz | |
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.
Using Merged-In instead of DNM
Bug: 137033385
Test: Forrest run build_test
Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6
Merged-In: 874b7a7766a569613dcd3ae526eaa6e1d4b78866
Merged-In: I99431a9a342e9b0617510e250597f3024ef39322
| -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 |