| commit | 35e0e89aa7d0cf1588cae8a8329b0edf38a19615 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Thu Oct 15 04:24:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 04:24:24 2020 +0000 |
| tree | 78df5dca693fb4257f281654ceb0236199e52102 | |
| parent | 04e9258e10ea36c90e75786bb62e105a79497284 [diff] | |
| parent | 0d0d422359de1d0c443edad0bb1168a125b94dfe [diff] |
resolve merge conflicts of 602859b18603fea642cbcd486563f6bfa981eb4d to rvc-d1-dev am: 3d723c29d1 am: 0d0d422359 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12735596 Change-Id: I1de7d552d8e43451700a347e6ec48ced444e9497
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 += \