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

Pack base_fs files into target_files.zip.

Browse Source 
am: f54216f292

* commit 'f54216f29238a67aad1199a0e85d09e443740bf0':
  Pack base_fs files into target_files.zip.

Change-Id: Ia68c3a707def1865151f071ca33a3bdc513f9045
This commit is contained in:
Tao Bao
2016-05-02 16:45:31 +00:00
committed by android-build-merger
parent e49c261cb4 f54216f292
commit be9457cad2
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/Makefile
View File

@@ -1574,7 +1574,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/fec \ $(HOST_OUT_EXECUTABLES)/fec \
$(HOST_OUT_EXECUTABLES)/brillo_update_payload \ $(HOST_OUT_EXECUTABLES)/brillo_update_payload \
$(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \ $(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \
$(HOST_OUT_EXECUTABLES)/delta_generator $(HOST_OUT_EXECUTABLES)/delta_generator \
$(BLK_ALLOC_TO_BASE_FS)
# Shared libraries. # Shared libraries.
OTATOOLS += \ OTATOOLS += \
@@ -1828,6 +1829,14 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
# OTA scripts are only interested in fingerprint related properties # OTA scripts are only interested in fingerprint related properties
$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt $(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt
endif endif
ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH),)
$(hide) $(ACP) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH) \
$(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH))
endif
ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH),)
$(hide) $(ACP) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \
$(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH))
endif
ifneq ($(strip $(SANITIZE_TARGET)),) ifneq ($(strip $(SANITIZE_TARGET)),)
# We need to create userdata.img with real data because the instrumented libraries are in userdata.img. # We need to create userdata.img with real data because the instrumented libraries are in userdata.img.
$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt $(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt

15
tools/releasetools/common.py
View File

@@ -182,6 +182,21 @@ def LoadInfoDict(input_file, input_dir=None):
d["ramdisk_fs_config"] = os.path.join( d["ramdisk_fs_config"] = os.path.join(
input_dir, "META", "root_filesystem_config.txt") input_dir, "META", "root_filesystem_config.txt")
# Redirect {system,vendor}_base_fs_file.
if "system_base_fs_file" in d:
basename = os.path.basename(d["system_base_fs_file"])
system_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(system_base_fs_file), \
"failed to find system base fs file: %s" % (system_base_fs_file,)
d["system_base_fs_file"] = system_base_fs_file
if "vendor_base_fs_file" in d:
basename = os.path.basename(d["vendor_base_fs_file"])
vendor_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(vendor_base_fs_file), \
"failed to find vendor base fs file: %s" % (vendor_base_fs_file,)
d["vendor_base_fs_file"] = vendor_base_fs_file
try: try:
data = read_helper("META/imagesizes.txt") data = read_helper("META/imagesizes.txt")
for line in data.split("\n"): for line in data.split("\n"):