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

Commit fa0f6547 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "(reland2) Remove emulator dependencies on non emulator targets (2)"... 

Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380 am: f1fc68b1 am: 931b7ca5 am: 501fce7e am: ba806fa9

Original change: https://android-review.googlesource.com/c/platform/build/+/2654583



Change-Id: I2bdef312f6c30642e9c412fa94c397937f6dd35d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e48489bc ba806fa9

target/board/generic/BoardConfig.mk

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

TARGET_CPU_ABI2 := armeabi





include build/make/target/board/BoardConfigGsiCommon.mk
 
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

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

# 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

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

TARGET_PRELINK_MODULE := false





include build/make/target/board/BoardConfigGsiCommon.mk
 
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

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

TARGET_ARCH_VARIANT := x86





include build/make/target/board/BoardConfigGsiCommon.mk
 
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

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

# 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

ifdef NET_ETH0_STARTONBOOT

  PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1

  PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1

endif

endif