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

Commit 9e02776e authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf2 

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



Change-Id: I8e2113ae0c1ccb488171fbd3dc0d87cdc78ea548
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a60fcee ee8b6cf2

core/Makefile

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




endif # my_installed_prebuilt_gki_apex not defined

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_apex_extracted_boot_image :=

my_installed_prebuilt_gki_apex :=

my_installed_prebuilt_gki_apex :=