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

Commit 5d1b4678 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Reland "Generate the list of installed files in recovery image.""

parents b05a4f1e 10fc9498

core/Makefile

+21 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,27 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_ 
INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_RECOVERY := $(PRODUCT_OUT)/installed-files-recovery.txt

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



# 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_FILES_FILE_RECOVERY): $(INSTALLED_BOOTIMAGE_TARGET)

else

$(INSTALLED_FILES_FILE_RECOVERY): $(INSTALLED_RECOVERYIMAGE_TARGET)

endif



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

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

	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) $(FILESLIST) $(TARGET_RECOVERY_ROOT_OUT) > $(@:.txt=.json)

	$(hide) build/make/tools/fileslist_util.py -c $(@:.txt=.json) > $@



recovery_initrc := $(call include-path-for, recovery)/etc/init.rc

recovery_sepolicy := \

    $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,8 @@ droidcore: files \ 
    $(INSTALLED_FILES_JSON_PRODUCT_SERVICES) \

    $(INSTALLED_FILES_FILE_SYSTEMOTHER) \

    $(INSTALLED_FILES_JSON_SYSTEMOTHER) \

    $(INSTALLED_FILES_FILE_RECOVERY) \

    $(INSTALLED_FILES_JSON_RECOVERY) \

    soong_docs



# dist_files only for putting your library into the dist directory with a full build.
@@ -1313,6 +1315,8 @@ else # TARGET_BUILD_APPS 
    $(INSTALLED_FILES_JSON_PRODUCT_SERVICES) \

    $(INSTALLED_FILES_FILE_SYSTEMOTHER) \

    $(INSTALLED_FILES_JSON_SYSTEMOTHER) \

    $(INSTALLED_FILES_FILE_RECOVERY) \

    $(INSTALLED_FILES_JSON_RECOVERY) \

    $(INSTALLED_BUILD_PROP_TARGET) \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \