Loading core/Makefile +5 −6 Original line number Diff line number Diff line Loading @@ -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) Loading Loading
core/Makefile +5 −6 Original line number Diff line number Diff line Loading @@ -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) Loading