From a6de2ada157fbd990345e6f0e62854768deedc77 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 26 Aug 2020 18:40:19 -0700 Subject: [PATCH 1/2] Fix incorrect conditional comment in target-files.zip rule Test: none Change-Id: I15ced0acc9cf6f56c5094bb8e5aaa3957a9648cb --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 06c6a8abb..2b246bb8d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4419,7 +4419,7 @@ endif ifdef BOARD_KERNEL_PAGESIZE echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/pagesize endif -endif # INSTALLED_VENDOR_BOOTIMAGE_TARGET not defined +endif # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER) endif # INSTALLED_RECOVERYIMAGE_TARGET defined or BOARD_USES_RECOVERY_AS_BOOT is true @# Components of the boot image $(hide) mkdir -p $(zip_root)/BOOT From 6af7cbe855b4a047038e5e9b6e461af120bbfed8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 26 Aug 2020 18:41:04 -0700 Subject: [PATCH 2/2] Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip BOARD_PREBUILT_ODM_DLKMIMAGE support seems to have been forgotten in target-files.zip, and BOARD_PREBUILT_ODM_DLKMIMAGE support had a typeo. Test: treehugger Change-Id: I9663220b43f0df4f39a7ef432ad4cfec39803a20 --- core/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 2b246bb8d..f10806dc4 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4609,9 +4609,13 @@ ifdef BOARD_PREBUILT_ODMIMAGE $(hide) mkdir -p $(zip_root)/IMAGES $(hide) cp $(INSTALLED_ODMIMAGE_TARGET) $(zip_root)/IMAGES/ endif -ifdef BOARD_PREBUILT_VENDOR_DLKIMMAGE +ifdef BOARD_PREBUILT_VENDOR_DLKMIMAGE $(hide) mkdir -p $(zip_root)/IMAGES - $(hide) cp $(INSTALLED_VENDOR_DLKIMMAGE_TARGET) $(zip_root)/IMAGES/ + $(hide) cp $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/ +endif +ifdef BOARD_PREBUILT_ODM_DLKMIMAGE + $(hide) mkdir -p $(zip_root)/IMAGES + $(hide) cp $(INSTALLED_ODM_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/ endif ifdef BOARD_PREBUILT_DTBOIMAGE $(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES