commit ebe65f8c0a4d45f3c8bd88c2129c14829b866e20
author Yifan Hong <elsk@google.com> Thu Oct 15 14:48:07 2020 -0700
committer Yifan Hong <elsk@google.com> Tue Oct 20 15:53:12 2020 -0700
tree 040900217005c4c2b411547ff8eb4bd27b8f8c05
parent 9873891bd0190cbae0943e48cae22a3fd2a55e07

Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE

Also gets the correct partition size and checks correctly.

Test: build aosp_arm64

Change-Id: I004e4b04d225d72db1904b983a6d03a916406085

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 1ab96ea..eeea49b 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -363,6 +363,8 @@
     BUILDING_BOOT_IMAGE :=
   else ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
     BUILDING_BOOT_IMAGE := true
+  else ifneq (,$(foreach kernel,$(BOARD_KERNEL_BINARIES),$(BOARD_$(call to-upper,$(kernel))_BOOTIMAGE_PARTITION_SIZE)))
+    BUILDING_BOOT_IMAGE := true
   endif
 else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true)
   ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)