From 54fbcaca2126dee67082d7562175f252c2da608a Mon Sep 17 00:00:00 2001 From: Bjoern Johansson Date: Thu, 31 Aug 2017 12:58:53 -0700 Subject: [PATCH] Update makefiles for WiFi in Treble Make sure files go in the right location on the vendor partition instead of system or data. Also add the wificond package which is now needed for WiFi to work. BUG: 74514143 Test: Compile and manually test that WiFi is working Change-Id: I7ea376bb1a23bb830f1ab3e4912799ec5e82e9bd (cherry picked from commit 82dbefe40b9110b8171ff978d65f0caf0b395da7) (cherry picked from commit ee5b4a90c41aec32d578f0fe6a3d323306cef796) --- target/product/emulator.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 9d4298735..55ec0233a 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -125,6 +125,7 @@ PRODUCT_PACKAGES += \ ip \ ipv6proxy \ iw \ + wificond \ wpa_supplicant \ PRODUCT_COPY_FILES += \ @@ -139,8 +140,9 @@ PRODUCT_COPY_FILES += \ 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