commit 49fb8ba87ced7c0872b945e2d353c9d7696cc2db
author Bjoern Johansson <bjoernj@google.com> Fri Mar 23 16:10:55 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 23 16:10:55 2018 +0000
tree 35931daec9d6e603c537db2a4e152b7ae8992dda
parent caf94b47d6e5a9475d5b1d798cf3deb5c425f235
parent 2308a600b07561c3baeba5549cc03c1850b1287e

Update makefiles for WiFi in Treble am: 54fbcaca21
am: 2308a600b0

Change-Id: I34363dc7f2a0075e84ecb04c599a9aa34a7fab70

target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 9d42987..55ec023 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -125,6 +125,7 @@
 	ip \
 	ipv6proxy \
 	iw \
+	wificond \
 	wpa_supplicant \
 
 PRODUCT_COPY_FILES += \
@@ -139,8 +140,9 @@
     device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
     device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-goldfish.xml \
     device/generic/goldfish/data/etc/config.ini:config.ini \
-    device/generic/goldfish/wifi/simulated_hostapd.conf:system/etc/simulated_hostapd.conf \
-    device/generic/goldfish/wifi/wpa_supplicant.conf:data/misc/wifi/wpa_supplicant.conf \
+    device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \
+    device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+    device/generic/goldfish/wifi/WifiConfigStore.xml:data/misc/wifi/WifiConfigStore.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml
 
 PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay