openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Remove the fallback-to-full logic." 

am: 896fa043bc

Change-Id: I05a02a21a909a7eedf018620be65dfb09e575199
This commit is contained in:
Tao Bao 2018-01-11 22:48:59 +00:00 committed by android-build-merger
parent 11348df23b 896fa043bc
commit c6548f8df4
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/releasetools/ota_from_target_files.py
View File

@ -165,7 +165,6 @@ OPTIONS.block_based = True
OPTIONS.updater_binary = None OPTIONS.updater_binary = None
OPTIONS.oem_source = None OPTIONS.oem_source = None
OPTIONS.oem_no_mount = False OPTIONS.oem_no_mount = False
OPTIONS.fallback_to_full = True
OPTIONS.full_radio = False OPTIONS.full_radio = False
OPTIONS.full_bootloader = False OPTIONS.full_bootloader = False
# Stash size cannot exceed cache_size * threshold. # Stash size cannot exceed cache_size * threshold.
@ -1288,8 +1287,6 @@ def main(argv):
OPTIONS.block_based = True OPTIONS.block_based = True
elif o in ("-b", "--binary"): elif o in ("-b", "--binary"):
OPTIONS.updater_binary = a OPTIONS.updater_binary = a
elif o in ("--no_fallback_to_full",):
OPTIONS.fallback_to_full = False
elif o == "--stash_threshold": elif o == "--stash_threshold":
try: try:
OPTIONS.stash_threshold = float(a) OPTIONS.stash_threshold = float(a)
@ -1327,7 +1324,6 @@ def main(argv):
"oem_settings=", "oem_settings=",
"oem_no_mount", "oem_no_mount",
"verify", "verify",
"no_fallback_to_full",
"stash_threshold=", "stash_threshold=",
"log_diff=", "log_diff=",
"payload_signer=", "payload_signer=",
@ -1465,8 +1461,7 @@ def main(argv):
if OPTIONS.incremental_source is None: if OPTIONS.incremental_source is None:
WriteFullOTAPackage(input_zip, output_zip) WriteFullOTAPackage(input_zip, output_zip)
# Generate an incremental OTA. It will fall back to generate a full OTA on # Generate an incremental OTA.
# failure unless no_fallback_to_full is specified.
else: else:
print("unzipping source target-files...") print("unzipping source target-files...")
OPTIONS.source_tmp, source_zip = common.UnzipTemp( OPTIONS.source_tmp, source_zip = common.UnzipTemp(
@ -1478,22 +1473,14 @@ def main(argv):
if OPTIONS.verbose: if OPTIONS.verbose:
print("--- source info ---") print("--- source info ---")
common.DumpInfoDict(OPTIONS.source_info_dict) common.DumpInfoDict(OPTIONS.source_info_dict)
try:
WriteBlockIncrementalOTAPackage(input_zip, source_zip, output_zip) WriteBlockIncrementalOTAPackage(input_zip, source_zip, output_zip)
if OPTIONS.log_diff:
out_file = open(OPTIONS.log_diff, 'w') if OPTIONS.log_diff:
with open(OPTIONS.log_diff, 'w') as out_file:
import target_files_diff import target_files_diff
target_files_diff.recursiveDiff('', target_files_diff.recursiveDiff(
OPTIONS.source_tmp, '', OPTIONS.source_tmp, OPTIONS.input_tmp, out_file)
OPTIONS.input_tmp,
out_file)
out_file.close()
except ValueError:
if not OPTIONS.fallback_to_full:
raise
print("--- failed to build incremental; falling back to full ---")
OPTIONS.incremental_source = None
WriteFullOTAPackage(input_zip, output_zip)
common.ZipClose(output_zip) common.ZipClose(output_zip)