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

Commit 8b037b67 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt" 

* commit '942672d8':
  Generate installed-files-vendor.txt
parents 24edc281 942672d8

core/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -1279,6 +1279,13 @@ INTERNAL_VENDORIMAGE_FILES := \ 
# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)



INSTALLED_FILES_FILE_VENDOR := $(PRODUCT_OUT)/installed-files-vendor.txt

$(INSTALLED_FILES_FILE_VENDOR) : $(INTERNAL_VENDORIMAGE_FILES)

	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) build/tools/fileslist.py $(TARGET_OUT_VENDOR) > $@



vendorimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,vendor)

BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img
@@ -1296,7 +1303,7 @@ endef 


# We just build this directly to the install location.

INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET)

$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES)

$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR)

	$(build-vendorimage-target)



.PHONY: vendorimage-nodeps

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -896,7 +896,8 @@ droidcore: files \ 
	$(INSTALLED_USERDATAIMAGE_TARGET) \

	$(INSTALLED_CACHEIMAGE_TARGET) \

	$(INSTALLED_VENDORIMAGE_TARGET) \

	$(INSTALLED_FILES_FILE)

	$(INSTALLED_FILES_FILE) \

	$(INSTALLED_FILES_FILE_VENDOR)



# dist_files only for putting your library into the dist directory with a full build.

.PHONY: dist_files
@@ -956,6 +957,7 @@ else # TARGET_BUILD_APPS 
    $(BUILT_OTATOOLS_PACKAGE) \

    $(SYMBOLS_ZIP) \

    $(INSTALLED_FILES_FILE) \

    $(INSTALLED_FILES_FILE_VENDOR) \

    $(INSTALLED_BUILD_PROP_TARGET) \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \