commit d270230fa49311901d8797a9e77865c37857d028
author Ying Wang <wangying@android.com> Wed Dec 11 23:11:52 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 23:11:53 2013 +0000
tree 1afd4062e7df4b480cd42df06453be599cf2bdd7
parent 8a373fd5aef4eafbd716abe517a99ef0b3d69094
parent 73d5abbd3f26d086ab4082f66b322f28a32bf7e5

Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"

tools/releasetools/sign_target_files_apks

diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks
index 00693b8..ab24706 100755
--- a/tools/releasetools/sign_target_files_apks
+++ b/tools/releasetools/sign_target_files_apks
@@ -235,8 +235,9 @@
       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