commit f45c19001fd9224edceb2fd5c3774e0121e73b0b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 09 23:37:28 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 09 23:37:28 2024 +0000
tree 7517c86c026c11dd570a60f1e9398b1c76ff5ebe
parent 85c79a3a3af6236d4901a03b2e9c2f46a1a98cb3
parent a43378be1951b69dca0d0999c2b5cd30e4982b30

Merge "Drop HOST_CROSS_ARCH special-case in source vs prebuilt mainline selection" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9d77ec1..b245d32 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1469,8 +1469,13 @@
 boototapackage_4k: $(BUILT_BOOT_OTA_PACKAGE_4K)
 .PHONY: boototapackage_4k
 
+ifeq ($(BOARD_16K_OTA_MOVE_VENDOR),true)
+$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip))
+$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_16k.zip))
+else
 $(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))
+endif # BOARD_16K_OTA_MOVE_VENDOR == true
 
 ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_4k.zip
 ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_16k.zip