From 12fd2d8824a45026f2416ccd37ee546c145f82ec Mon Sep 17 00:00:00 2001 From: Bjoern Johansson Date: Thu, 4 May 2017 10:51:02 -0700 Subject: [PATCH] Enable WiFi for arm, arm64 and x86_64 Set the required parameters in BoardConfigs to allow WiFi to work on remaining architectures. Also update SELinux policy needed to make WiFi work on arm and arm64. This was not required on x86 but refused to work on arm without these changes. BUG: 74514143 Test: Build emulator image and manually verify WiFi functionality Change-Id: Ic645ccf7249f84ae0320770b0ef7b1b6102b7b14 (cherry picked from commit 6d28bfbeefea8fe1919ff0987ae3d935d974dc6d) (cherry picked from commit 023a7ba64bd3b189a148ad388606ca5747ea20b1) (cherry picked from commit 9c9cefdafbae50c0e371c30bcccb98a8b7697e98) --- target/board/generic/BoardConfig.mk | 11 +++++++++++ target/board/generic/sepolicy/goldfish_setup.te | 2 +- target/board/generic_arm64/BoardConfig.mk | 11 +++++++++++ target/board/generic_x86_64/BoardConfig.mk | 11 +++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 67d019f0a1..b13c5dff8f 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -65,6 +65,17 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +# Wifi. +BOARD_WLAN_DEVICE := wlan0 +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated +WPA_SUPPLICANT_VERSION := VER_0_8_X +WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" +WIFI_DRIVER_FW_PATH_STA := "/dev/null" +WIFI_DRIVER_FW_PATH_AP := "/dev/null" + # Enable A/B update TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true diff --git a/target/board/generic/sepolicy/goldfish_setup.te b/target/board/generic/sepolicy/goldfish_setup.te index 1ce8ec7caa..34ac4d13a8 100644 --- a/target/board/generic/sepolicy/goldfish_setup.te +++ b/target/board/generic/sepolicy/goldfish_setup.te @@ -19,7 +19,7 @@ set_prop(goldfish_setup, ctl_default_prop); allow goldfish_setup self:netlink_route_socket nlmsg_write; allow goldfish_setup self:netlink_socket create_socket_perms; allow goldfish_setup self:capability { sys_module sys_admin }; -allow goldfish_setup varrun_file:dir { mounton write add_name search remove_name }; +allow goldfish_setup varrun_file:dir { mounton open read write add_name search remove_name }; allow goldfish_setup varrun_file:file { mounton getattr create read write open unlink }; allow goldfish_setup execns_exec:file rx_file_perms; allow goldfish_setup proc_net:file w_file_perms; diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index e066e3a879..258b016c0d 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -96,6 +96,17 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy +# Wifi. +BOARD_WLAN_DEVICE := wlan0 +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated +WPA_SUPPLICANT_VERSION := VER_0_8_X +WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" +WIFI_DRIVER_FW_PATH_STA := "/dev/null" +WIFI_DRIVER_FW_PATH_AP := "/dev/null" + # Enable A/B update TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index a9c5142049..b7c2de7988 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -62,6 +62,17 @@ BOARD_SEPOLICY_DIRS += \ BOARD_VNDK_VERSION := current +# Wifi. +BOARD_WLAN_DEVICE := wlan0 +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated +WPA_SUPPLICANT_VERSION := VER_0_8_X +WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" +WIFI_DRIVER_FW_PATH_STA := "/dev/null" +WIFI_DRIVER_FW_PATH_AP := "/dev/null" + # Enable A/B update TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true