Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54fbcaca authored by Bjoern Johansson's avatar Bjoern Johansson
Browse files

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)
parent 760871c7

target/product/emulator.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -125,6 +125,7 @@ PRODUCT_PACKAGES += \ 
	ip \

	ip \

	ipv6proxy \

	ipv6proxy \

	iw \

	iw \

	wificond \

	wpa_supplicant \

	wpa_supplicant \





PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \
@@ -139,8 +140,9 @@ PRODUCT_COPY_FILES += \ 
    device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \

    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/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/data/etc/config.ini:config.ini \

    device/generic/goldfish/wifi/simulated_hostapd.conf:system/etc/simulated_hostapd.conf \

    device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \

    device/generic/goldfish/wifi/wpa_supplicant.conf:data/misc/wifi/wpa_supplicant.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

    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

PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay