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

Merge "Ensure that 'release-keys' are set on properties"

Browse Source
This commit is contained in:
Tao Bao
2019-05-03 20:15:26 +00:00
committed by Gerrit Code Review
parent f14e865cfb 234f4b418f
commit cc389947d0
2 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/sign_target_files_apks.py
View File

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

56
tools/releasetools/test_sign_target_files_apks.py
View File

@@ -53,36 +53,60 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
def test_RewriteProps(self): def test_RewriteProps(self):
props = ( props = (
('', '\n'), ('', ''),
('ro.build.fingerprint=foo/bar/dev-keys', ('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/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/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/dev-keys',
'ro.vendor.build.thumbprint=foo/bar/release-keys\n'), 'ro.vendor.build.thumbprint=foo/bar/release-keys'),
('# comment line 1', '# comment line 1\n'), ('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/dev-keys',
'ro.bootimage.build.fingerprint=foo/bar/release-keys\n'), 'ro.bootimage.build.fingerprint=foo/bar/release-keys'),
('ro.build.description=' ('ro.build.description='
'sailfish-user 8.0.0 OPR6.170623.012 4283428 dev-keys', 'sailfish-user 8.0.0 OPR6.170623.012 4283428 dev-keys',
'ro.build.description=' 'ro.build.description='
'sailfish-user 8.0.0 OPR6.170623.012 4283428 release-keys\n'), 'sailfish-user 8.0.0 OPR6.170623.012 4283428 release-keys'),
('ro.build.tags=dev-keys', 'ro.build.tags=release-keys\n'), ('ro.build.tags=dev-keys', 'ro.build.tags=release-keys'),
('# comment line 2', '# comment line 2\n'), ('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 dev-keys',
'ro.build.display.id=OPR6.170623.012\n'), 'ro.build.display.id=OPR6.170623.012'),
('# comment line 3', '# comment line 3\n'), ('# comment line 3', '# comment line 3'),
) )
# Assert the case for each individual line. # Assert the case for each individual line.
for prop, output in props: for prop, expected in props:
self.assertEqual(RewriteProps(prop), output) self.assertEqual(expected + '\n', RewriteProps(prop))
# Concatenate all the input lines. # Concatenate all the input lines.
self.assertEqual(RewriteProps('\n'.join([prop[0] for prop in props])), self.assertEqual(
''.join([prop[1] for prop in props])) '\n'.join([prop[1] for prop in props]) + '\n',
RewriteProps('\n'.join([prop[0] for prop in props])))
def test_ReplaceVerityKeyId(self): def test_ReplaceVerityKeyId(self):
BOOT_CMDLINE1 = ( BOOT_CMDLINE1 = (