From 6257eb21441d3d433dd87d93df7ce7b8bbc705bf Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 22 Aug 2023 17:47:44 -0700 Subject: [PATCH] Add a 16K boot partition OTA target This OTA will be used to switch real devices to 16K kernel Test: th Bug: 293313353 Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f --- core/Makefile | 7 +++++++ core/config.mk | 1 + 2 files changed, 8 insertions(+) diff --git a/core/Makefile b/core/Makefile index ce0ecdc9f5..982e0c1e19 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1106,6 +1106,13 @@ $(BUILT_BOOTIMAGE_16K_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILE bootimage_16k: $(BUILT_BOOTIMAGE_16K_TARGET) .PHONY: bootimage_16k +BUILT_BOOT_OTA_PACKAGE_16K := $(PRODUCT_OUT)/boot_ota_16k.zip +$(BUILT_BOOT_OTA_PACKAGE_16K): $(OTA_FROM_RAW_IMG) $(BUILT_BOOTIMAGE_16K_TARGET) + $(OTA_FROM_RAW_IMG) --path $(HOST_OUT) --partition_name boot --output $@ $(BUILT_BOOTIMAGE_16K_TARGET) + +boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K) +.PHONY: boototapackage_16k + endif diff --git a/core/config.mk b/core/config.mk index 2a30dd92a3..0809cedea3 100644 --- a/core/config.mk +++ b/core/config.mk @@ -740,6 +740,7 @@ endif IMG_FROM_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/img_from_target_files$(HOST_EXECUTABLE_SUFFIX) MAKE_RECOVERY_PATCH := $(HOST_OUT_EXECUTABLES)/make_recovery_patch$(HOST_EXECUTABLE_SUFFIX) OTA_FROM_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/ota_from_target_files$(HOST_EXECUTABLE_SUFFIX) +OTA_FROM_RAW_IMG := $(HOST_OUT_EXECUTABLES)/ota_from_raw_img$(HOST_EXECUTABLE_SUFFIX) SPARSE_IMG := $(HOST_OUT_EXECUTABLES)/sparse_img$(HOST_EXECUTABLE_SUFFIX) CHECK_PARTITION_SIZES := $(HOST_OUT_EXECUTABLES)/check_partition_sizes$(HOST_EXECUTABLE_SUFFIX) SYMBOLS_MAP := $(HOST_OUT_EXECUTABLES)/symbols_map