From 1af7e1fa7f8a4b35fdda1a9a1083e7db65d43231 Mon Sep 17 00:00:00 2001 From: Tomislav Novak Date: Thu, 21 Sep 2023 13:48:57 -0700 Subject: [PATCH] emulator_arm64: Revert TARGET_NO_KERNEL to emulator default With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on $PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup in emulator_arm64/device.mk"). $ lunch sdk_phone_arm64-eng && m [...] FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by 'out/target/product/emulator_arm64/boot.img', missing and no known rule to make it Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that the emulator then uses, so no need to generate the boot image. Test: lunch sdk_phone_arm64-eng && m Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5 --- target/board/emulator_arm64/BoardConfig.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/board/emulator_arm64/BoardConfig.mk b/target/board/emulator_arm64/BoardConfig.mk index 963e558b6b..c16e61bf53 100644 --- a/target/board/emulator_arm64/BoardConfig.mk +++ b/target/board/emulator_arm64/BoardConfig.mk @@ -51,9 +51,6 @@ endif include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigEmuCommon.mk -TARGET_NO_KERNEL := false -BOARD_USES_RECOVERY_AS_BOOT := true - BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800