From 62e2231b8296fc7dfd6b639fcd73d1e66effdf10 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 20 Jun 2019 14:27:45 +0900 Subject: [PATCH] Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set. Based on current Makefile INSTALLED_BOOTIMAGE_TARGET always kept as empty if TARGET_NO_KERNEL is true, so build fails with empty out path. This change is to set up INSTALLED_BOOTIMAGE_TARGET with $(PRODUCT_OUT)/boot.img in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is defined. Bug: 135648566 Test: m -j passed Change-Id: I9658f215c2e2cc5d87040d5085521ef44722c4ef --- core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Makefile b/core/Makefile index 0d83b8101c..5096e665c7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1088,6 +1088,7 @@ ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) # Remove when b/63676296 is resolved. $(error Prebuilt bootimage is only supported for AB targets) endif +INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img $(eval $(call copy-one-file,$(BOARD_PREBUILT_BOOTIMAGE),$(INSTALLED_BOOTIMAGE_TARGET))) else # BOARD_PREBUILT_BOOTIMAGE not defined INSTALLED_BOOTIMAGE_TARGET :=