Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2." (d0527001) · Commits · e / os / android_build

tools/releasetools/common.py

+3 −5

Original line number	Diff line number	Diff line
		@@ -1431,8 +1431,6 @@ class BlockDifference(object):
		self.disable_imgdiff = disable_imgdiff

		if version is None:
		version = 1
		if OPTIONS.info_dict:
		version = max(
		int(i) for i in
		OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))

+18 −31

Original line number	Diff line number	Diff line
		@@ -682,11 +682,10 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
		system_src = GetImage("system", OPTIONS.source_tmp)
		system_tgt = GetImage("system", OPTIONS.target_tmp)

		blockimgdiff_version = 1
		if OPTIONS.info_dict:
		blockimgdiff_version = max(
		int(i) for i in
		OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
		assert blockimgdiff_version >= 3

		# Check the first block of the source system partition for remount R/W only
		# if the filesystem is ext4.
		@@ -784,18 +783,6 @@ else if get_stage("%(bcb_dev)s") != "3/3" then

		device_specific.IncrementalOTA_VerifyBegin()

		# When blockimgdiff version is less than 3 (non-resumable block-based OTA),
		# patching on a device that's already on the target build will damage the
		# system. Because operations like move don't check the block state, they
		# always apply the changes unconditionally.
		if blockimgdiff_version <= 2:
		if source_oem_props is None:
		script.AssertSomeFingerprint(source_fp)
		else:
		script.AssertSomeThumbprint(
		GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))

		else: # blockimgdiff_version > 2
		if source_oem_props is None and target_oem_props is None:
		script.AssertSomeFingerprint(source_fp, target_fp)
		elif source_oem_props is not None and target_oem_props is not None: