From fd5e673f9f9f3b32df18b9987e6be90922279e26 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 22 Mar 2023 16:52:43 -0700 Subject: [PATCH] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 aosp_64bitonly_x86_64 gets broken by the emulator changes otherwise. Bug: 274103438 Test: m Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878 Signed-off-by: Roman Kiryanov --- target/board/generic_64bitonly_x86_64/BoardConfig.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/board/generic_64bitonly_x86_64/BoardConfig.mk b/target/board/generic_64bitonly_x86_64/BoardConfig.mk index 71c4357ec4..a240eab5ee 100644 --- a/target/board/generic_64bitonly_x86_64/BoardConfig.mk +++ b/target/board/generic_64bitonly_x86_64/BoardConfig.mk @@ -26,7 +26,10 @@ TARGET_2ND_ARCH := x86 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 @@ -43,3 +46,5 @@ 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