| commit | fdad123a3d2a17bfba4325036ad711dd0d6cc5fc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 18:41:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 18:41:29 2020 +0000 |
| tree | 8e173e6fd1966bf865acf5af0d312816666300cf | |
| parent | ccd5bc2b1c09ffc4d35cd8f5f397bc35b33e3030 [diff] | |
| parent | c2b2a519c5adc0e31fd9306f95388fd9d6b99ae3 [diff] |
Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417 am: 2f7b994a6f am: c2b2a519c5 Original change: https://android-review.googlesource.com/c/platform/build/+/1453726 Change-Id: Icafde80cf1dba59b7f2d072438a2e1acd1231bcb
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 += \