am c5c82361: am d532077a: am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"

* commit 'c5c8236101d5426cf0d027b21546a0bb05d54bf2':
  sign_target_files_apks: rewrite build.prop correctly in eng builds
This commit is contained in:
Ying Wang 2013-12-11 23:20:49 +00:00 committed by Android Git Automerger
commit 1b53b6a7c8
1 changed files with 3 additions and 2 deletions

View File

@ -235,8 +235,9 @@ def RewriteProps(data):
elif key == "ro.build.display.id":
# change, eg, "JWR66N dev-keys" to "JWR66N"
value = value.split()
if len(value) == 2 and value[1].endswith("-keys"):
value = value[0]
if len(value) > 1 and value[-1].endswith("-keys"):
value.pop()
value = " ".join(value)
line = key + "=" + value
if line != original_line:
print " replace: ", original_line