StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

Browse Source 
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
This commit is contained in:
Ying Wang
2014-01-27 15:56:45 -08:00
parent ae49acbde7 7382ec7db8
commit 04cff70804
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/ota_from_target_files
View File

@@ -94,6 +94,7 @@ OPTIONS.extra_script = None
OPTIONS.aslr_mode = True OPTIONS.aslr_mode = True
OPTIONS.worker_threads = 3 OPTIONS.worker_threads = 3
OPTIONS.two_step = False OPTIONS.two_step = False
OPTIONS.no_signing = False
def MostPopularKey(d, default): def MostPopularKey(d, default):
"""Given a dict, return the key corresponding to the largest """Given a dict, return the key corresponding to the largest
@@ -968,6 +969,8 @@ def main(argv):
OPTIONS.worker_threads = int(a) OPTIONS.worker_threads = int(a)
elif o in ("-2", "--two_step"): elif o in ("-2", "--two_step"):
OPTIONS.two_step = True OPTIONS.two_step = True
elif o in ("--no_signing"):
OPTIONS.no_signing = True
else: else:
return False return False
return True return True
@@ -983,6 +986,7 @@ def main(argv):
"worker_threads=", "worker_threads=",
"aslr_mode=", "aslr_mode=",
"two_step", "two_step",
"no_signing",
], ],
extra_option_handler=option_handler) extra_option_handler=option_handler)
@@ -1017,6 +1021,9 @@ def main(argv):
OPTIONS.device_specific = os.path.normpath(OPTIONS.device_specific) OPTIONS.device_specific = os.path.normpath(OPTIONS.device_specific)
print "using device-specific extensions in", OPTIONS.device_specific print "using device-specific extensions in", OPTIONS.device_specific
if OPTIONS.no_signing:
output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED)
else:
temp_zip_file = tempfile.NamedTemporaryFile() temp_zip_file = tempfile.NamedTemporaryFile()
output_zip = zipfile.ZipFile(temp_zip_file, "w", output_zip = zipfile.ZipFile(temp_zip_file, "w",
compression=zipfile.ZIP_DEFLATED) compression=zipfile.ZIP_DEFLATED)
@@ -1043,6 +1050,7 @@ def main(argv):
output_zip.close() output_zip.close()
if not OPTIONS.no_signing:
SignOutput(temp_zip_file.name, args[1]) SignOutput(temp_zip_file.name, args[1])
temp_zip_file.close() temp_zip_file.close()