| commit | 0d142625ccdffb3709fba489694987d97c42621e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Oct 12 04:48:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 12 04:48:53 2020 +0000 |
| tree | b0f17f6f7b13c109bdd07e7d4340e70ec419fb36 | |
| parent | 02d2b29a73bf52c2ff1d8f17111eefd3f7e8e206 [diff] | |
| parent | 597d38165e4c714a164777d94fb24a86f8f916be [diff] |
Merge changes from topic "board-system-ext-sepolicy" am: 6d34f734ae am: 62b08d287a am: 597d38165e Original change: https://android-review.googlesource.com/c/platform/build/+/1273731 Change-Id: I7a0b75a2a38f7feed800cd41f823d9d3953937e4
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 += \