commit 2610f3467154f0bb8e6362eb7c24c07316666a62
author Ken Chen <cken@google.com> Thu Aug 31 02:38:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 31 02:38:02 2023 +0000
tree 37ae9bbb44897ab1209f96049a8cd7dd4fa3722f
parent a2674525ae3a23a297edfeafe6d4d939a6a0dcd7

Revert "Add 16k/4k boot OTAs to /system partition"

This reverts commit a2674525ae3a23a297edfeafe6d4d939a6a0dcd7.

Reason for revert: Investigate b/298295675

Change-Id: Ia44137695d6e9a1b99f4cc6e4dcc88bd3b4156db

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9be879d..41b9cad 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1436,28 +1436,6 @@
 
 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 :=