Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f am: 2c309f0175 am: e89fa4075a

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

Change-Id: I21fbd4266e37628ce3ceda53b75ca971f5925d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-23 10:16:41 +00:00 committed by Automerger Merge Worker
commit 8912bb943c

View file

@ -26,7 +26,10 @@ TARGET_2ND_ARCH := x86
TARGET_2ND_ARCH_VARIANT := x86_64 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 include build/make/target/board/BoardConfigEmuCommon.mk
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@ -43,3 +46,5 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"
WIFI_DRIVER_FW_PATH_STA := "/dev/null" WIFI_DRIVER_FW_PATH_STA := "/dev/null"
WIFI_DRIVER_FW_PATH_AP := "/dev/null" WIFI_DRIVER_FW_PATH_AP := "/dev/null"
endif # !BUILDING_GSI