diff options
| author | Pawan Wagh <waghpawan@google.com> | 2024-04-29 22:22:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 22:22:17 +0000 |
| commit | cc1dd590fd60cec6eef80c2ab95d236a2175c96d (patch) | |
| tree | b0a4af726fa6f17ceea93acf896ac836ef72968e /core | |
| parent | faeac4d7f7e0906c03de11e10130a23126381834 (diff) | |
| parent | bd2d79d3111f6c0f844780a117d719b90b8b1d2d (diff) | |
| download | build-cc1dd590fd60cec6eef80c2ab95d236a2175c96d.tar.gz | |
Merge "Fix dependency of system img on boot_otas" into main
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index e563873798..00577edfa5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1477,13 +1477,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 |