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

Commit 02b9b9e1 authored by Richard Xie's avatar Richard Xie Committed by Gerrit Code Review
Browse files

Revert "Remove emulator dependencies on non emulator targets (2)" 

Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
parent d82931f9

target/board/generic/BoardConfig.mk

+17 −0
Original line number Diff line number Diff line
@@ -30,3 +30,20 @@ TARGET_CPU_ABI := armeabi-v7a 
TARGET_CPU_ABI2 := armeabi



include build/make/target/board/BoardConfigGsiCommon.mk



ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



# Wifi.

BOARD_WLAN_DEVICE           := emulator

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"

endif

target/board/generic/device.mk

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ 
# limitations under the License.

#



PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu

PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

target/board/generic_64bitonly_x86_64/BoardConfig.mk

+20 −0
Original line number Diff line number Diff line
@@ -28,3 +28,23 @@ TARGET_2ND_ARCH_VARIANT := x86_64 
TARGET_PRELINK_MODULE := false



include build/make/target/board/BoardConfigGsiCommon.mk



ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86



# Wifi.

BOARD_WLAN_DEVICE           := emulator

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"



endif # !BUILDING_GSI

target/board/generic_x86/BoardConfig.mk

+20 −0
Original line number Diff line number Diff line
@@ -19,3 +19,23 @@ TARGET_ARCH := x86 
TARGET_ARCH_VARIANT := x86



include build/make/target/board/BoardConfigGsiCommon.mk



ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



# Resize to 4G to accomodate ASAN and CTS

BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296



BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86



# Wifi.

BOARD_WLAN_DEVICE           := emulator

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"

endif

target/board/generic_x86/device.mk

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
# limitations under the License.

#



PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu

PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.



ifdef NET_ETH0_STARTONBOOT

  PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1

endif