diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-25 06:03:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-25 06:03:01 +0000 |
| commit | 0e0307b0a276246ae1ce35332f464e49d52dc90d (patch) | |
| tree | cdcb8ad46cd6951f329e252f8d921006e74248ee | |
| parent | 90c1763c0cc864649841782ecdf311df538140bd (diff) | |
| parent | e643120c75f6e6b7f883a17b798d683c8f18d60c (diff) | |
| download | build-0e0307b0a276246ae1ce35332f464e49d52dc90d.tar.gz | |
Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files"
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 1fbcf34ec0..cb5e44cb72 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4608,11 +4608,15 @@ endif ifdef BUILDING_VENDOR_BOOT_IMAGE $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_RAMDISK_FILES) $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_TARGETS) + # The vendor ramdisk may be built from the recovery ramdisk. + ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)) + $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP) + endif endif ifdef BUILDING_RECOVERY_IMAGE # TODO(b/30414428): Can't depend on INTERNAL_RECOVERYIMAGE_FILES alone like other - # BUILD_TARGET_FILES_PACKAGE dependencies because currently there're cp/rsync/rm + # BUILT_TARGET_FILES_PACKAGE dependencies because currently there're cp/rsync/rm # commands in build-recoveryimage-target, which would touch the files under # TARGET_RECOVERY_OUT and race with packaging target-files.zip. ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) |