DO NOT MERGE releasetools: allow for multiple OEM property values. (4d57163b) · Commits · e / os / android_build

tools/releasetools/edify_generator.py

+17 −15

Original line number	Diff line number	Diff line
		@@ -77,26 +77,28 @@ class EdifyGenerator(object):
		with temporary=True) to this one."""
		self.script.extend(other.script)

		def AssertOemProperty(self, name, value):
		"""Assert that a property on the OEM paritition matches a value."""
		def AssertOemProperty(self, name, values):
		"""Assert that a property on the OEM paritition matches allowed values."""
		if not name:
		raise ValueError("must specify an OEM property")
		if not value:
		if not values:
		raise ValueError("must specify the OEM value")
		get_prop_command = None
		if common.OPTIONS.oem_no_mount:
		cmd = ('getprop("{name}") == "{value}" \|\| '
		'abort("E{code}: This package expects the value \\"{value}\\" for '
		'\\"{name}\\"; this has value \\"" + '
		'getprop("{name}") + "\\".");').format(
		code=common.ErrorCode.OEM_PROP_MISMATCH,
		name=name, value=value)
		get_prop_command = 'getprop("%s")' % name
		else:
		cmd = ('file_getprop("/oem/oem.prop", "{name}") == "{value}" \|\| '
		'abort("E{code}: This package expects the value \\"{value}\\" for '
		'\\"{name}\\" on the OEM partition; this has value \\"" + '
		'file_getprop("/oem/oem.prop", "{name}") + "\\".");').format(
		get_prop_command = 'file_getprop("/oem/oem.prop", "%s")' % name

		cmd = ''
		for value in values:
		cmd += '%s == "%s" \|\| ' % (get_prop_command, value)
		cmd += (
		'abort("E{code}: This package expects the value \\"{values}\\" for '
		'\\"{name}\\"; this has value \\"" + '
		'{get_prop_command} + "\\".");').format(
		code=common.ErrorCode.OEM_PROP_MISMATCH,
		name=name, value=value)
		get_prop_command=get_prop_command, name=name,
		values='\\" or \\"'.join(values))
		self.script.append(cmd)

		def AssertSomeFingerprint(self, *fp):

tools/releasetools/ota_from_target_files.py

+69 −64

Original line number	Diff line number	Diff line
		@@ -50,9 +50,11 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
		Remount and verify the checksums of the files written to the
		system and vendor (if used) partitions. Incremental builds only.

		-o (--oem_settings) <file>
		Use the file to specify the expected OEM-specific properties
		on the OEM partition of the intended device.
		-o (--oem_settings) <main_file[,additional_files...]>
		Comma seperated list of files used to specify the expected OEM-specific
		properties on the OEM partition of the intended device.
		Multiple expected values can be used by providing multiple files.


		--oem_no_mount
		For devices with OEM-specific properties but without an OEM partition,
		@@ -451,20 +453,38 @@ def SignOutput(temp_zip_name, output_zip_name):
		whole_file=True)


		def AppendAssertions(script, info_dict, oem_dict=None):
		def AppendAssertions(script, info_dict, oem_dicts=None):
		oem_props = info_dict.get("oem_fingerprint_properties")
		if oem_props is None or len(oem_props) == 0:
		device = GetBuildProp("ro.product.device", info_dict)
		script.AssertDevice(device)
		else:
		if oem_dict is None:
		if not oem_dicts:
		raise common.ExternalError(
		"No OEM file provided to answer expected assertions")
		for prop in oem_props.split():
		if oem_dict.get(prop) is None:
		values = []
		for oem_dict in oem_dicts:
		if oem_dict.get(prop):
		values.append(oem_dict[prop])
		if not values:
		raise common.ExternalError(
		"The OEM file is missing the property %s" % prop)
		script.AssertOemProperty(prop, oem_dict.get(prop))
		script.AssertOemProperty(prop, values)


		def _LoadOemDicts(script, recovery_mount_options):
		"""Returns the list of loaded OEM properties dict."""
		oem_dicts = None
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		if not OPTIONS.oem_no_mount:
		script.Mount("/oem", recovery_mount_options)
		oem_dicts = []
		for oem_file in OPTIONS.oem_source:
		oem_dicts.append(common.LoadDictionaryFromLines(
		open(oem_file).readlines()))
		return oem_dicts


		def _WriteRecoveryImageToBoot(script, output_zip):
		@@ -577,19 +597,15 @@ def WriteFullOTAPackage(input_zip, output_zip):

		oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
		recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
		oem_dict = None
		if oem_props is not None and len(oem_props) > 0:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		if not OPTIONS.oem_no_mount:
		script.Mount("/oem", recovery_mount_options)
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())
		oem_dicts = None
		if oem_props:
		oem_dicts = _LoadOemDicts(script, recovery_mount_options)

		metadata = {
		"post-build": CalculateFingerprint(oem_props, oem_dict,
		"post-build": CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.info_dict),
		"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
		"pre-device": GetOemProperty("ro.product.device", oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.info_dict),
		"post-timestamp": GetBuildProp("ro.build.date.utc", OPTIONS.info_dict),
		}
		@@ -613,7 +629,7 @@ def WriteFullOTAPackage(input_zip, output_zip):
		ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict)
		script.AssertOlderBuild(ts, ts_text)

		AppendAssertions(script, OPTIONS.info_dict, oem_dict)
		AppendAssertions(script, OPTIONS.info_dict, oem_dicts)
		device_specific.FullOTA_Assertions()

		# Two-step package strategy (in chronological order, which is not
		@@ -664,7 +680,7 @@ else if get_stage("%(bcb_dev)s") == "3/3" then

		# Dump fingerprints
		script.Print("Target: %s" % CalculateFingerprint(
		oem_props, oem_dict, OPTIONS.info_dict))
		oem_props, oem_dicts and oem_dicts[0], OPTIONS.info_dict))

		device_specific.FullOTA_InstallBegin()

		@@ -839,17 +855,13 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
		oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
		recovery_mount_options = OPTIONS.source_info_dict.get(
		"recovery_mount_options")
		oem_dict = None
		if oem_props is not None and len(oem_props) > 0:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		if not OPTIONS.oem_no_mount:
		script.Mount("/oem", recovery_mount_options)
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())
		oem_dicts = None
		if oem_props:
		oem_dicts = _LoadOemDicts(script, recovery_mount_options)

		metadata = {
		"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
		"pre-device": GetOemProperty("ro.product.device", oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.source_info_dict),
		"ota-type": "BLOCK",
		}
		@@ -885,9 +897,9 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
		metadata=metadata,
		info_dict=OPTIONS.source_info_dict)

		source_fp = CalculateFingerprint(oem_props, oem_dict,
		source_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.source_info_dict)
		target_fp = CalculateFingerprint(oem_props, oem_dict,
		target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.target_info_dict)
		metadata["pre-build"] = source_fp
		metadata["post-build"] = target_fp
		@@ -952,7 +964,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
		else:
		vendor_diff = None

		AppendAssertions(script, OPTIONS.target_info_dict, oem_dict)
		AppendAssertions(script, OPTIONS.target_info_dict, oem_dicts)
		device_specific.IncrementalOTA_Assertions()

		# Two-step incremental package strategy (in chronological order,
		@@ -1004,9 +1016,9 @@ else if get_stage("%(bcb_dev)s") != "3/3" then

		# Dump fingerprints
		script.Print("Source: %s" % CalculateFingerprint(
		oem_props, oem_dict, OPTIONS.source_info_dict))
		oem_props, oem_dicts and oem_dicts[0], OPTIONS.source_info_dict))
		script.Print("Target: %s" % CalculateFingerprint(
		oem_props, oem_dict, OPTIONS.target_info_dict))
		oem_props, oem_dicts and oem_dicts[0], OPTIONS.target_info_dict))

		script.Print("Verifying current system...")

		@@ -1155,18 +1167,16 @@ def WriteVerifyPackage(input_zip, output_zip):
		oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
		recovery_mount_options = OPTIONS.info_dict.get(
		"recovery_mount_options")
		oem_dict = None
		if oem_props is not None and len(oem_props) > 0:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		script.Mount("/oem", recovery_mount_options)
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())
		oem_dicts = None
		if oem_props:
		oem_dicts = _LoadOemDicts(script, recovery_mount_options)

		target_fp = CalculateFingerprint(oem_props, oem_dict, OPTIONS.info_dict)
		target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.info_dict)
		metadata = {
		"post-build": target_fp,
		"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
		"pre-device": GetOemProperty("ro.product.device", oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.info_dict),
		"post-timestamp": GetBuildProp("ro.build.date.utc", OPTIONS.info_dict),
		}
		@@ -1180,7 +1190,7 @@ def WriteVerifyPackage(input_zip, output_zip):
		metadata=metadata,
		info_dict=OPTIONS.info_dict)

		AppendAssertions(script, OPTIONS.info_dict, oem_dict)
		AppendAssertions(script, OPTIONS.info_dict, oem_dicts)

		script.Print("Verifying device images against %s..." % target_fp)
		script.AppendExtra("")
		@@ -1252,19 +1262,17 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,

		# Metadata to comply with Android OTA package format.
		oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties", None)
		oem_dict = None
		oem_dicts = None
		if oem_props:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())
		oem_dicts = _LoadOemDicts(script, None)

		metadata = {
		"post-build": CalculateFingerprint(oem_props, oem_dict,
		"post-build": CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.info_dict),
		"post-build-incremental" : GetBuildProp("ro.build.version.incremental",
		OPTIONS.info_dict),
		"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
		"pre-device": GetOemProperty("ro.product.device", oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.info_dict),
		"post-timestamp": GetBuildProp("ro.build.date.utc", OPTIONS.info_dict),
		"ota-required-cache": "0",
		@@ -1272,7 +1280,8 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
		}

		if source_file is not None:
		metadata["pre-build"] = CalculateFingerprint(oem_props, oem_dict,
		metadata["pre-build"] = CalculateFingerprint(oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.source_info_dict)
		metadata["pre-build-incremental"] = GetBuildProp(
		"ro.build.version.incremental", OPTIONS.source_info_dict)
		@@ -1540,17 +1549,13 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
		oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
		recovery_mount_options = OPTIONS.source_info_dict.get(
		"recovery_mount_options")
		oem_dict = None
		if oem_props is not None and len(oem_props) > 0:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		if not OPTIONS.oem_no_mount:
		script.Mount("/oem", recovery_mount_options)
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())
		oem_dicts = None
		if oem_props:
		oem_dicts = _LoadOemDicts(script, recovery_mount_options)

		metadata = {
		"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
		"pre-device": GetOemProperty("ro.product.device", oem_props,
		oem_dicts and oem_dicts[0],
		OPTIONS.source_info_dict),
		"ota-type": "FILE",
		}
		@@ -1594,9 +1599,9 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
		else:
		vendor_diff = None

		target_fp = CalculateFingerprint(oem_props, oem_dict,
		target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.target_info_dict)
		source_fp = CalculateFingerprint(oem_props, oem_dict,
		source_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
		OPTIONS.source_info_dict)

		if oem_props is None:
		@@ -1634,7 +1639,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
		# 0.1 for unpacking verbatim files, symlinking, and doing the
		# device-specific commands.

		AppendAssertions(script, OPTIONS.target_info_dict, oem_dict)
		AppendAssertions(script, OPTIONS.target_info_dict, oem_dicts)
		device_specific.IncrementalOTA_Assertions()

		# Two-step incremental package strategy (in chronological order,
		@@ -1972,7 +1977,7 @@ def main(argv):
		OPTIONS.downgrade = True
		OPTIONS.wipe_user_data = True
		elif o in ("-o", "--oem_settings"):
		OPTIONS.oem_source = a
		OPTIONS.oem_source = a.split(',')
		elif o == "--oem_no_mount":
		OPTIONS.oem_no_mount = True
		elif o in ("-e", "--extra_script"):