Merge "Ensure that 'release-keys' are set on properties" (cc389947) · Commits · e / os / android_build

tools/releasetools/sign_target_files_apks.py

+10 −3

Original line number	Diff line number	Diff line
		@@ -558,6 +558,13 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
		# System properties.
		elif filename in ("SYSTEM/build.prop",
		"VENDOR/build.prop",
		"SYSTEM/vendor/build.prop",
		"ODM/build.prop",
		"VENDOR/odm/build.prop",
		"PRODUCT/build.prop",
		"SYSTEM/product/build.prop",
		"PRODUCT_SERVICES/build.prop",
		"SYSTEM/product_services/build.prop",
		"SYSTEM/etc/prop.default",
		"BOOT/RAMDISK/prop.default",
		"BOOT/RAMDISK/default.prop", # legacy
		@@ -752,8 +759,8 @@ def RewriteProps(data):
		original_line = line
		if line and line[0] != '#' and "=" in line:
		key, value = line.split("=", 1)
		if key in ("ro.build.fingerprint", "ro.build.thumbprint",
		"ro.vendor.build.fingerprint", "ro.vendor.build.thumbprint"):
		if (key.startswith("ro.") and
		key.endswith((".build.fingerprint", ".build.thumbprint"))):
		pieces = value.split("/")
		pieces[-1] = EditTags(pieces[-1])
		value = "/".join(pieces)
		@@ -766,7 +773,7 @@ def RewriteProps(data):
		assert len(pieces) == 5
		pieces[-1] = EditTags(pieces[-1])
		value = " ".join(pieces)
		elif key == "ro.build.tags":
		elif key.startswith("ro.") and key.endswith(".build.tags"):
		value = EditTags(value)
		elif key == "ro.build.display.id":
		# change, eg, "JWR66N dev-keys" to "JWR66N"

tools/releasetools/test_sign_target_files_apks.py

+40 −16

Original line number	Diff line number	Diff line
		@@ -53,36 +53,60 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te

		def test_RewriteProps(self):
		props = (
		('', '\n'),
		('', ''),
		('ro.build.fingerprint=foo/bar/dev-keys',
		'ro.build.fingerprint=foo/bar/release-keys\n'),
		'ro.build.fingerprint=foo/bar/release-keys'),
		('ro.build.thumbprint=foo/bar/dev-keys',
		'ro.build.thumbprint=foo/bar/release-keys\n'),
		'ro.build.thumbprint=foo/bar/release-keys'),
		('ro.vendor.build.fingerprint=foo/bar/dev-keys',
		'ro.vendor.build.fingerprint=foo/bar/release-keys\n'),
		'ro.vendor.build.fingerprint=foo/bar/release-keys'),
		('ro.vendor.build.thumbprint=foo/bar/dev-keys',
		'ro.vendor.build.thumbprint=foo/bar/release-keys\n'),
		('# comment line 1', '# comment line 1\n'),
		'ro.vendor.build.thumbprint=foo/bar/release-keys'),
		('ro.odm.build.fingerprint=foo/bar/test-keys',
		'ro.odm.build.fingerprint=foo/bar/release-keys'),
		('ro.odm.build.thumbprint=foo/bar/test-keys',
		'ro.odm.build.thumbprint=foo/bar/release-keys'),
		('ro.product.build.fingerprint=foo/bar/dev-keys',
		'ro.product.build.fingerprint=foo/bar/release-keys'),
		('ro.product.build.thumbprint=foo/bar/dev-keys',
		'ro.product.build.thumbprint=foo/bar/release-keys'),
		('ro.product_services.build.fingerprint=foo/bar/test-keys',
		'ro.product_services.build.fingerprint=foo/bar/release-keys'),
		('ro.product_services.build.thumbprint=foo/bar/test-keys',
		'ro.product_services.build.thumbprint=foo/bar/release-keys'),
		('# comment line 1', '# comment line 1'),
		('ro.bootimage.build.fingerprint=foo/bar/dev-keys',
		'ro.bootimage.build.fingerprint=foo/bar/release-keys\n'),
		'ro.bootimage.build.fingerprint=foo/bar/release-keys'),
		('ro.build.description='
		'sailfish-user 8.0.0 OPR6.170623.012 4283428 dev-keys',
		'ro.build.description='
		'sailfish-user 8.0.0 OPR6.170623.012 4283428 release-keys\n'),
		('ro.build.tags=dev-keys', 'ro.build.tags=release-keys\n'),
		('# comment line 2', '# comment line 2\n'),
		'sailfish-user 8.0.0 OPR6.170623.012 4283428 release-keys'),
		('ro.build.tags=dev-keys', 'ro.build.tags=release-keys'),
		('ro.build.tags=test-keys', 'ro.build.tags=release-keys'),
		('ro.system.build.tags=dev-keys',
		'ro.system.build.tags=release-keys'),
		('ro.vendor.build.tags=dev-keys',
		'ro.vendor.build.tags=release-keys'),
		('ro.odm.build.tags=dev-keys',
		'ro.odm.build.tags=release-keys'),
		('ro.product.build.tags=dev-keys',
		'ro.product.build.tags=release-keys'),
		('ro.product_services.build.tags=dev-keys',
		'ro.product_services.build.tags=release-keys'),
		('# comment line 2', '# comment line 2'),
		('ro.build.display.id=OPR6.170623.012 dev-keys',
		'ro.build.display.id=OPR6.170623.012\n'),
		('# comment line 3', '# comment line 3\n'),
		'ro.build.display.id=OPR6.170623.012'),
		('# comment line 3', '# comment line 3'),
		)

		# Assert the case for each individual line.
		for prop, output in props:
		self.assertEqual(RewriteProps(prop), output)
		for prop, expected in props:
		self.assertEqual(expected + '\n', RewriteProps(prop))

		# Concatenate all the input lines.
		self.assertEqual(RewriteProps('\n'.join([prop[0] for prop in props])),
		''.join([prop[1] for prop in props]))
		self.assertEqual(
		'\n'.join([prop[1] for prop in props]) + '\n',
		RewriteProps('\n'.join([prop[0] for prop in props])))

		def test_ReplaceVerityKeyId(self):
		BOOT_CMDLINE1 = (