p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

releasetools: Remove the dead code for blockimgdiff_version <= 2. 

The code is on infeasible path since we already have assertions in
common.BlockDifference().

Also remove the dead code that checks for OPTIONS.info_dict, as we
already set that in ota_from_target_files.main(), for both of A/B and
non-A/B.

Test: Generate incremental OTAs w/ and w/o the CL, and get identical
      packages.
Change-Id: Ifb8fc101e78f5ce58c60c8e49028b66ce0d20246
This commit is contained in:
Tao Bao 2017-12-21 11:47:01 -08:00
parent 7889375102
commit 0582cb639f
2 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@ -1431,11 +1431,9 @@ class BlockDifference(object):
self.disable_imgdiff = disable_imgdiff self.disable_imgdiff = disable_imgdiff
if version is None: if version is None:
version = 1 version = max(
if OPTIONS.info_dict: int(i) for i in
version = max( OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
int(i) for i in
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
assert version >= 3 assert version >= 3
self.version = version self.version = version

49
tools/releasetools/ota_from_target_files.py
View File

@ -682,11 +682,10 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
system_src = GetImage("system", OPTIONS.source_tmp) system_src = GetImage("system", OPTIONS.source_tmp)
system_tgt = GetImage("system", OPTIONS.target_tmp) system_tgt = GetImage("system", OPTIONS.target_tmp)
blockimgdiff_version = 1 blockimgdiff_version = max(
if OPTIONS.info_dict: int(i) for i in
blockimgdiff_version = max( OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
int(i) for i in assert blockimgdiff_version >= 3
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
# Check the first block of the source system partition for remount R/W only # Check the first block of the source system partition for remount R/W only
# if the filesystem is ext4. # if the filesystem is ext4.
@ -784,32 +783,20 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
device_specific.IncrementalOTA_VerifyBegin() device_specific.IncrementalOTA_VerifyBegin()
# When blockimgdiff version is less than 3 (non-resumable block-based OTA), if source_oem_props is None and target_oem_props is None:
# patching on a device that's already on the target build will damage the script.AssertSomeFingerprint(source_fp, target_fp)
# system. Because operations like move don't check the block state, they elif source_oem_props is not None and target_oem_props is not None:
# always apply the changes unconditionally. script.AssertSomeThumbprint(
if blockimgdiff_version <= 2: GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict),
if source_oem_props is None: GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
script.AssertSomeFingerprint(source_fp) elif source_oem_props is None and target_oem_props is not None:
else: script.AssertFingerprintOrThumbprint(
script.AssertSomeThumbprint( source_fp,
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict))
else:
else: # blockimgdiff_version > 2 script.AssertFingerprintOrThumbprint(
if source_oem_props is None and target_oem_props is None: target_fp,
script.AssertSomeFingerprint(source_fp, target_fp) GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
elif source_oem_props is not None and target_oem_props is not None:
script.AssertSomeThumbprint(
GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict),
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
elif source_oem_props is None and target_oem_props is not None:
script.AssertFingerprintOrThumbprint(
source_fp,
GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict))
else:
script.AssertFingerprintOrThumbprint(
target_fp,
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
# Check the required cache size (i.e. stashed blocks). # Check the required cache size (i.e. stashed blocks).
size = [] size = []