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

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

Browse Source 
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
  Generate installed-files-vendor.txt
This commit is contained in:
Ying Wang
2015-09-15 23:10:16 +00:00
committed by Android Git Automerger
parent 1dd4dfbfd7 45075cf623
commit 942672d82b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/Makefile
View File

@@ -1278,6 +1278,13 @@ INTERNAL_VENDORIMAGE_FILES := \
# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES). # platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).
$(INSTALLED_PLATFORM_ZIP) : $(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 := \ vendorimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,vendor) $(call intermediates-dir-for,PACKAGING,vendor)
BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img
@@ -1295,7 +1302,7 @@ endef
# We just build this directly to the install location. # We just build this directly to the install location.
INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET) 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) $(build-vendorimage-target)
.PHONY: vendorimage-nodeps .PHONY: vendorimage-nodeps

4
core/main.mk
View File

@@ -896,7 +896,8 @@ droidcore: files \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_CACHEIMAGE_TARGET) \
$(INSTALLED_VENDORIMAGE_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. # dist_files only for putting your library into the dist directory with a full build.
.PHONY: dist_files .PHONY: dist_files
@@ -956,6 +957,7 @@ else # TARGET_BUILD_APPS
$(BUILT_OTATOOLS_PACKAGE) \ $(BUILT_OTATOOLS_PACKAGE) \
$(SYMBOLS_ZIP) \ $(SYMBOLS_ZIP) \
$(INSTALLED_FILES_FILE) \ $(INSTALLED_FILES_FILE) \
$(INSTALLED_FILES_FILE_VENDOR) \
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
$(BUILT_TARGET_FILES_PACKAGE) \ $(BUILT_TARGET_FILES_PACKAGE) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \