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

resolve merge conflicts of 4058a71 to stage-aosp-master

Browse Source 
Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916
This commit is contained in:
Tao Bao
2016-07-11 09:08:24 -07:00
parent c4449f819c 4058a71747
commit 538ed261eb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/ota_from_target_files.py
View File

@@ -866,15 +866,17 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
int(i) for i in int(i) for i in
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(",")) OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
# Check first block of system partition for remount R/W only if # Check the first block of the source system partition for remount R/W only
# disk type is ext4 # if the filesystem is ext4.
system_partition = OPTIONS.source_info_dict["fstab"]["/system"] system_src_partition = OPTIONS.source_info_dict["fstab"]["/system"]
check_first_block = system_partition.fs_type == "ext4" check_first_block = system_src_partition.fs_type == "ext4"
# Disable using imgdiff for squashfs. 'imgdiff -z' expects input files to be # Disable using imgdiff for squashfs. 'imgdiff -z' expects input files to be
# in zip formats. However with squashfs, a) all files are compressed in LZ4; # in zip formats. However with squashfs, a) all files are compressed in LZ4;
# b) the blocks listed in block map may not contain all the bytes for a given # b) the blocks listed in block map may not contain all the bytes for a given
# file (because they're rounded to be 4K-aligned). # file (because they're rounded to be 4K-aligned).
disable_imgdiff = system_partition.fs_type == "squashfs" system_tgt_partition = OPTIONS.target_info_dict["fstab"]["/system"]
disable_imgdiff = (system_src_partition.fs_type == "squashfs" or
system_tgt_partition.fs_type == "squashfs")
system_diff = common.BlockDifference("system", system_tgt, system_src, system_diff = common.BlockDifference("system", system_tgt, system_src,
check_first_block, check_first_block,
version=blockimgdiff_version, version=blockimgdiff_version,