From 275bdb08cdc112f2b3b46725b14ae200651daa9e Mon Sep 17 00:00:00 2001 From: Bjoern Johansson Date: Tue, 14 Nov 2017 17:10:44 -0800 Subject: [PATCH] Build emulator images with emulator WiFi HAL Use the new emulator WiFi HAL. This is specified by the BOARD_WLAN_DEVICE setting. This also requires that the wifi HAL service is included. BUG: 74514143 Bug: 68338427 Test: run cts -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testWifiDownload Change-Id: Ib59550b6cfba1e2e8686a5c805cd6b3913e8508e (cherry picked from commit 23073c6ee33eca56f1ae0c45615b87ec9aec712e) (cherry picked from commit 2d51c9b2bf0774ac46837a93181c83329e6fc662) --- target/board/generic/BoardConfig.mk | 2 +- target/board/generic/sepolicy/hal_wifi_default.te | 1 + target/board/generic_arm64/BoardConfig.mk | 2 +- target/board/generic_x86/BoardConfig.mk | 2 +- target/board/generic_x86_64/BoardConfig.mk | 2 +- target/product/emulator.mk | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 target/board/generic/sepolicy/hal_wifi_default.te diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index b13c5dff8f..7ab9021375 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -66,7 +66,7 @@ BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true # Wifi. -BOARD_WLAN_DEVICE := wlan0 +BOARD_WLAN_DEVICE := emulator BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated diff --git a/target/board/generic/sepolicy/hal_wifi_default.te b/target/board/generic/sepolicy/hal_wifi_default.te new file mode 100644 index 0000000000..de4b9969be --- /dev/null +++ b/target/board/generic/sepolicy/hal_wifi_default.te @@ -0,0 +1 @@ +allow hal_wifi_default hal_wifi_default:netlink_route_socket { create bind write read nlmsg_read }; diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 258b016c0d..d5f79f4ae3 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -97,7 +97,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy # Wifi. -BOARD_WLAN_DEVICE := wlan0 +BOARD_WLAN_DEVICE := emulator BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 76463cb02e..2d00506d00 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -69,7 +69,7 @@ TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # Wifi. -BOARD_WLAN_DEVICE := wlan0 +BOARD_WLAN_DEVICE := emulator BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index b7c2de7988..5377fb15ff 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -63,7 +63,7 @@ BOARD_SEPOLICY_DIRS += \ BOARD_VNDK_VERSION := current # Wifi. -BOARD_WLAN_DEVICE := wlan0 +BOARD_WLAN_DEVICE := emulator BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 55ec0233af..7a6aa09c87 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -55,6 +55,7 @@ PRODUCT_PACKAGES += \ audio.primary.goldfish \ audio.primary.goldfish_legacy \ android.hardware.audio@2.0-service \ + android.hardware.wifi@1.0-service \ vibrator.goldfish \ power.goldfish \ power.ranchu \