Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4a80852 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4 am: 61291bb9 

Original change: https://android-review.googlesource.com/c/platform/build/+/2737042



Change-Id: Ie67f3eed1c5b04194c9ea1ee30bb43ee89d220f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae9d49b5 61291bb9

core/Makefile

+22 −0
Original line number Diff line number Diff line
@@ -1438,6 +1438,28 @@ endif # BOARD_PREBUILT_BOOTIMAGE 


endif # my_installed_prebuilt_gki_apex not defined



ifneq ($(BOARD_KERNEL_PATH_16K),)

BUILT_BOOT_OTA_PACKAGE_4K := $(PRODUCT_OUT)/boot_ota_4k.zip

$(BUILT_BOOT_OTA_PACKAGE_4K): $(OTA_FROM_RAW_IMG) $(INSTALLED_BOOTIMAGE_TARGET) $(DEFAULT_SYSTEM_DEV_CERTIFICATE).pk8

	$(OTA_FROM_RAW_IMG) --package_key $(DEFAULT_SYSTEM_DEV_CERTIFICATE) \

                      --max_timestamp `cat $(BUILD_DATETIME_FILE)` \

                      --path $(HOST_OUT) \

                      --partition_name boot \

                      --output $@ \

                      $(INSTALLED_BOOTIMAGE_TARGET)



boototapackage_4k: $(BUILT_BOOT_OTA_PACKAGE_4K)

.PHONY: boototapackage_4k



$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT)/boot_otas/boot_ota_4k.zip))

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT)/boot_otas/boot_ota_16k.zip))



ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_4k.zip

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_16k.zip





endif



my_apex_extracted_boot_image :=

my_installed_prebuilt_gki_apex :=