p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 1b53b6a7 to master 

Change-Id: Id08fb8de4f136596fd39b651446ec96fc952427a
This commit is contained in:
Ying Wang 2013-12-11 15:27:46 -08:00
parent d56f77da5d 1b53b6a7c8
commit c4b1577d6e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/sign_target_files_apks
View File

@ -235,10 +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]
else:
value = " ".join(value)
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