StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files" am: 0e0307b0a2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1606554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3252e0bdce61ee240dd42d6a287705433956aa9a
This commit is contained in:
Treehugger Robot
2021-02-25 06:30:02 +00:00
committed by Automerger Merge Worker
parent b002cc3fbe 0e0307b0a2
commit 38cbde20c0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -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)