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

Merge "Create symlink /system/vendor if necessary."

Browse Source
This commit is contained in:
Ying Wang
2014-06-19 20:21:11 +00:00
committed by Android (Google) Code Review
parent 5c14a0f761 23898df867
commit c8bdce1a72
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/Makefile
View File

@@ -878,9 +878,20 @@ systemimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage) $(call intermediates-dir-for,PACKAGING,systemimage)
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
# Create symlink /system/vendor to /vendor if necessary.
ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE
define create-system-vendor-symlink
$(hide) ln -sf /vendor $(TARGET_OUT)/vendor
endef
else
define create-system-vendor-symlink
endef
endif
# $(1): output file # $(1): output file
define build-systemimage-target define build-systemimage-target
@echo "Target system fs image: $(1)" @echo "Target system fs image: $(1)"
$(call create-system-vendor-symlink)
@mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt @mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt
$(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, \ $(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, \
skip_fsck=true) skip_fsck=true)
@@ -936,10 +947,11 @@ endif
####### #######
## system tarball ## system tarball
define build-systemtarball-target define build-systemtarball-target
$(call pretty,"Target system fs tarball: $(INSTALLED_SYSTEMTARBALL_TARGET)") $(call pretty,"Target system fs tarball: $(INSTALLED_SYSTEMTARBALL_TARGET)")
$(MKTARBALL) $(FS_GET_STATS) \ $(call create-system-vendor-symlink)
$(PRODUCT_OUT) system $(PRIVATE_SYSTEM_TAR) \ $(MKTARBALL) $(FS_GET_STATS) \
$(INSTALLED_SYSTEMTARBALL_TARGET) $(PRODUCT_OUT) system $(PRIVATE_SYSTEM_TAR) \
$(INSTALLED_SYSTEMTARBALL_TARGET)
endef endef
ifndef SYSTEM_TARBALL_FORMAT ifndef SYSTEM_TARBALL_FORMAT