| commit | e468a9fd2066d3843f27ff32a10ddd4be690c055 | [log] [tgz] |
|---|---|---|
| author | Steve Muckle <smuckle@google.com> | Mon Oct 12 01:44:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 12 01:44:00 2020 +0000 |
| tree | 042fc48a7e0f7f5c19493acb869b6db2f53dd11c | |
| parent | 6ff29067a3bfe2767623d7b61321c68a9b586be0 [diff] | |
| parent | c9eefe4ad25a584834877414fb05862120ca4fcc [diff] |
Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840 am: c9eefe4ad2 Original change: https://android-review.googlesource.com/c/platform/build/+/1455798 Change-Id: I69a16b64717049803bb36bc1dbe5ae0f320e38c3
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 += \