| commit | 8bf690343fca735edd53eccda1c0ad838cc3ad27 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Mon Oct 12 10:47:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 12 10:47:25 2020 +0000 |
| tree | 7512b9f4ef68ac17891964573cd815084bcfa8df | |
| parent | 0d142625ccdffb3709fba489694987d97c42621e [diff] | |
| parent | 1be17f1595bb7186a504e1b2f9ab4074c14caa5f [diff] |
Merge "Make the build fail when the executable prebuilt target check fails." am: dee171a859 am: 5c3f09cb39 am: 1be17f1595 Original change: https://android-review.googlesource.com/c/platform/build/+/1442940 Change-Id: If8ae6d2d2782b0ef4bc13f648bb16729f5328c49
diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk index 42edd92..fe62f74 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk
@@ -18,7 +18,6 @@ # compatible product configs) PRODUCT_CFI_INCLUDE_PATHS := \ device/google/cuttlefish/guest/libs/wpa_supplicant_8_lib \ - device/google/wahoo/wifi_offload \ external/tinyxml2 \ external/wpa_supplicant_8 \ frameworks/av/camera \
diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 1004dc5..4ebec51 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk
@@ -58,7 +58,6 @@ # The values should be of the format <apex name>:<jar name> PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ com.android.permission:service-permission \ - com.android.wifi:service-wifi \ com.android.ipsec:android.net.ipsec.ike \ PRODUCT_COPY_FILES += \