Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f93ad0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make installed-files-recovery.txt depend on rsync timestamp" am: ed41c73d am: ae2bf412 

Original change: https://android-review.googlesource.com/c/platform/build/+/1515806

Change-Id: Ia531ba9818d045bc92067ac979ca5b7766e4548c
parents f8035b19 ae2bf412

core/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -1666,16 +1666,15 @@ INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \ 
INSTALLED_FILES_FILE_RECOVERY := $(PRODUCT_OUT)/installed-files-recovery.txt

INSTALLED_FILES_JSON_RECOVERY := $(INSTALLED_FILES_FILE_RECOVERY:.txt=.json)



ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

INSTALLED_BOOTIMAGE_TARGET := $(BUILT_BOOTIMAGE_TARGET)

endif



# TODO(b/30414428): Can't depend on INTERNAL_RECOVERYIMAGE_FILES alone like other

# INSTALLED_FILES_FILE_* rules. Because currently there're cp/rsync/rm commands in

# build-recoveryimage-target, which would touch the files under TARGET_RECOVERY_OUT and race with

# the call to FILELIST.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

INSTALLED_BOOTIMAGE_TARGET := $(BUILT_BOOTIMAGE_TARGET)

$(INSTALLED_FILES_FILE_RECOVERY): $(INSTALLED_BOOTIMAGE_TARGET)

else

$(INSTALLED_FILES_FILE_RECOVERY): $(INSTALLED_RECOVERYIMAGE_TARGET)

endif

$(INSTALLED_FILES_FILE_RECOVERY): $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP)



$(INSTALLED_FILES_FILE_RECOVERY): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_RECOVERY)

$(INSTALLED_FILES_FILE_RECOVERY): $(INTERNAL_RECOVERYIMAGE_FILES) $(FILESLIST) $(FILESLIST_UTIL)