From e643120c75f6e6b7f883a17b798d683c8f18d60c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 24 Feb 2021 11:44:55 -0800 Subject: [PATCH] Add dependency from target-files.zip to rsync'd recovery ramdisk files target-files.zip may indirectly depend on the rsync'd recovery ramdisk files when BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true. Bug: 181095653 Test: manual Change-Id: I673bb48b1fbb7a54455cda411f9444f05ddaa24f --- core/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index a7553f0ba..5f17c047f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4598,11 +4598,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)