| commit | 6ff29067a3bfe2767623d7b61321c68a9b586be0 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Oct 09 19:09:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 19:09:37 2020 +0000 |
| tree | 2b0d9b68e2cee08e0dbd30f1c782f60ca065ff61 | |
| parent | fdad123a3d2a17bfba4325036ad711dd0d6cc5fc [diff] | |
| parent | 97abaede421a5f841c2f8ab3f7a093dccaa29710 [diff] |
Merge "Build otatools files before building OTA packages." am: 49ccbb3729 am: e5491533ae am: 97abaede42 Original change: https://android-review.googlesource.com/c/platform/build/+/1455215 Change-Id: Idc53a74c335b446907300b6bbb6661cd08197a38
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 += \