Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev

This commit is contained in:
Michael Runge
2014-12-15 21:35:18 +00:00
committed by Android (Google) Code Review

View File

@@ -295,12 +295,12 @@ def RewriteProps(data, misc_info):
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 == "ro.build.fingerprint" if (key in ("ro.build.fingerprint", "ro.vendor.build.fingerprint")
and misc_info.get("oem_fingerprint_properties") is None): and misc_info.get("oem_fingerprint_properties") is None):
pieces = value.split("/") pieces = value.split("/")
pieces[-1] = EditTags(pieces[-1]) pieces[-1] = EditTags(pieces[-1])
value = "/".join(pieces) value = "/".join(pieces)
elif (key == "ro.build.thumbprint" elif (key in ("ro.build.thumbprint", "ro.vendor.build.thumbprint")
and misc_info.get("oem_fingerprint_properties") is not None): and misc_info.get("oem_fingerprint_properties") is not None):
pieces = value.split("/") pieces = value.split("/")
pieces[-1] = EditTags(pieces[-1]) pieces[-1] = EditTags(pieces[-1])