diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-24 20:27:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-24 20:27:27 +0000 |
| commit | d7fd1d8ab866b964b8402868c2d5ca61aa1f272e (patch) | |
| tree | e9593a432555d61330e6f778bf0b5ebe20255c2c | |
| parent | 2775b2a90d474fefb70b6d2dddc3f1e61d429fa1 (diff) | |
| parent | 67e14f015c3717827b8e89658289a543a5a8c06f (diff) | |
| download | poplar-d7fd1d8ab866b964b8402868c2d5ca61aa1f272e.tar.gz | |
Merge "Build wifi support from source"
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | device.mk | 9 | ||||
| -rwxr-xr-x | proprietary/bt-wifi/hostapd | bin | 654772 -> 0 bytes | |||
| -rw-r--r-- | proprietary/bt-wifi/libwifi-hal.so | bin | 93852 -> 0 bytes | |||
| -rwxr-xr-x | proprietary/bt-wifi/wpa_supplicant | bin | 1451956 -> 0 bytes |
5 files changed, 6 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 6aba962..9a285a7 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -46,9 +46,12 @@ BOARD_SEPOLICY_DIRS := device/linaro/poplar/sepolicy TARGET_USES_HWC2 := true # wifi +BOARD_WLAN_DEVICE := rtl WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) TARGET_COPY_OUT_VENDOR := vendor @@ -160,16 +160,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ wificond \ - wificond.rc \ libwpa_client \ - wpa_cli + wpa_supplicant \ + hostapd ## config files PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \ - $(LOCAL_PATH)/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ - $(LOCAL_PATH)/proprietary/bt-wifi/libwifi-hal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwifi-hal.so \ - $(LOCAL_PATH)/proprietary/bt-wifi/wpa_supplicant:$(TARGET_COPY_OUT_VENDOR)/bin/hw/wpa_supplicant \ - $(LOCAL_PATH)/proprietary/bt-wifi/hostapd:$(TARGET_COPY_OUT_VENDOR)/bin/hostapd + $(LOCAL_PATH)/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf ## service init.rc scripts PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi.rc diff --git a/proprietary/bt-wifi/hostapd b/proprietary/bt-wifi/hostapd Binary files differdeleted file mode 100755 index 96d324a..0000000 --- a/proprietary/bt-wifi/hostapd +++ /dev/null diff --git a/proprietary/bt-wifi/libwifi-hal.so b/proprietary/bt-wifi/libwifi-hal.so Binary files differdeleted file mode 100644 index 2cbc54b..0000000 --- a/proprietary/bt-wifi/libwifi-hal.so +++ /dev/null diff --git a/proprietary/bt-wifi/wpa_supplicant b/proprietary/bt-wifi/wpa_supplicant Binary files differdeleted file mode 100755 index eb26aaa..0000000 --- a/proprietary/bt-wifi/wpa_supplicant +++ /dev/null |