aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawan Wagh <waghpawan@google.com>2024-04-29 19:48:26 +0000
committerPawan Wagh <waghpawan@google.com>2024-04-29 19:48:26 +0000
commitbd2d79d3111f6c0f844780a117d719b90b8b1d2d (patch)
tree621cf115f91b20786a84764d437211fc453c2fbd
parent8f9ca8075f90165f2a44b4d582cc85ae0be9fc72 (diff)
downloadbuild-bd2d79d3111f6c0f844780a117d719b90b8b1d2d.tar.gz
Fix dependency of system img on boot_otas
If BOARD_16K_OTA_MOVE_VENDOR := true is set BoardConfig, there is still dependency of system img on boot otas as it is system ota paths are being added in default installed modules. Add vendor paths whenever move vendor is set. Bug: 335022191 Test: m Change-Id: I19b41e5b9ade50f3cabf43995af36e66e09c6acf
-rw-r--r--core/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile
index b245d3264e..41a97d961f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1472,13 +1472,14 @@ boototapackage_4k: $(BUILT_BOOT_OTA_PACKAGE_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))
+ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip
+ALL_DEFAULT_INSTALLED_MODULES += $(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
+endif # BOARD_16K_OTA_MOVE_VENDOR == true
endif