commit 73d5abbd3f26d086ab4082f66b322f28a32bf7e5
author Andrew Boie <andrew.p.boie@intel.com> Wed Dec 11 12:42:03 2013 -0800
committer Andrew Boie <andrew.p.boie@intel.com> Wed Dec 11 13:23:15 2013 -0800
tree 1afd4062e7df4b480cd42df06453be599cf2bdd7
parent 8a373fd5aef4eafbd716abe517a99ef0b3d69094

sign_target_files_apks: rewrite build.prop correctly in eng builds

In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.

Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

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