diff options
| author | Ying Wang <wangying@android.com> | 2013-12-11 23:11:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-11 23:11:53 +0000 |
| commit | d270230fa49311901d8797a9e77865c37857d028 (patch) | |
| tree | 1afd4062e7df4b480cd42df06453be599cf2bdd7 /tools | |
| parent | 8a373fd5aef4eafbd716abe517a99ef0b3d69094 (diff) | |
| parent | 73d5abbd3f26d086ab4082f66b322f28a32bf7e5 (diff) | |
| download | build-d270230fa49311901d8797a9e77865c37857d028.zip build-d270230fa49311901d8797a9e77865c37857d028.tar.gz build-d270230fa49311901d8797a9e77865c37857d028.tar.bz2 | |
Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ 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 |