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

Commit 275bdb08 authored Nov 14, 2017 by Bjoern Johansson

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)

parent 54fbcaca

target/board/generic/BoardConfig.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
	BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

	# Wifi.		# Wifi.
	BOARD_WLAN_DEVICE := wlan0		BOARD_WLAN_DEVICE := emulator
	BOARD_HOSTAPD_DRIVER := NL80211		BOARD_HOSTAPD_DRIVER := NL80211
	BOARD_WPA_SUPPLICANT_DRIVER := NL80211		BOARD_WPA_SUPPLICANT_DRIVER := NL80211
	BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated		BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated

target/board/generic/sepolicy/hal_wifi_default.te

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			allow hal_wifi_default hal_wifi_default:netlink_route_socket { create bind write read nlmsg_read };

target/board/generic_arm64/BoardConfig.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
	BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy		BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy

	# Wifi.		# Wifi.
	BOARD_WLAN_DEVICE := wlan0		BOARD_WLAN_DEVICE := emulator
	BOARD_HOSTAPD_DRIVER := NL80211		BOARD_HOSTAPD_DRIVER := NL80211
	BOARD_WPA_SUPPLICANT_DRIVER := NL80211		BOARD_WPA_SUPPLICANT_DRIVER := NL80211
	BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated		BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated

target/board/generic_x86/BoardConfig.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ TARGET_NO_RECOVERY := true
	BOARD_BUILD_SYSTEM_ROOT_IMAGE := true		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

	# Wifi.		# Wifi.
	BOARD_WLAN_DEVICE := wlan0		BOARD_WLAN_DEVICE := emulator
	BOARD_HOSTAPD_DRIVER := NL80211		BOARD_HOSTAPD_DRIVER := NL80211
	BOARD_WPA_SUPPLICANT_DRIVER := NL80211		BOARD_WPA_SUPPLICANT_DRIVER := NL80211
	BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated		BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated

target/board/generic_x86_64/BoardConfig.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ BOARD_SEPOLICY_DIRS += \
	BOARD_VNDK_VERSION := current		BOARD_VNDK_VERSION := current

	# Wifi.		# Wifi.
	BOARD_WLAN_DEVICE := wlan0		BOARD_WLAN_DEVICE := emulator
	BOARD_HOSTAPD_DRIVER := NL80211		BOARD_HOSTAPD_DRIVER := NL80211
	BOARD_WPA_SUPPLICANT_DRIVER := NL80211		BOARD_WPA_SUPPLICANT_DRIVER := NL80211
	BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated		BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated