diff options
| author | Ying Wang <wangying@android.com> | 2013-12-11 15:15:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 15:15:10 -0800 |
| commit | d532077a8ff27b30728b32150c5733dafc783a3d (patch) | |
| tree | 60b185224055d90e471e0c3600197df853bd6deb /tools | |
| parent | 0e2779bdbb80b6f94534af0b9128ced4b6caa418 (diff) | |
| parent | d270230fa49311901d8797a9e77865c37857d028 (diff) | |
| download | build-d532077a8ff27b30728b32150c5733dafc783a3d.zip build-d532077a8ff27b30728b32150c5733dafc783a3d.tar.gz build-d532077a8ff27b30728b32150c5733dafc783a3d.tar.bz2 | |
am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit 'd270230fa49311901d8797a9e77865c37857d028':
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 |