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

Merge "releasetools: Clean up two no-op lines that set 'ota-wipe'."

This commit is contained in:
Treehugger Robot 2018-02-02 17:28:35 +00:00 committed by Gerrit Code Review
parent a4c7d59afc 24604cc5b9
commit 76c6906bf2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/ota_from_target_files.py
View File

@ -919,7 +919,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
if OPTIONS.two_step: if OPTIONS.two_step:
if not source_info.get("multistage_support"): if not source_info.get("multistage_support"):
assert False, "two-step packages not supported by this build" assert False, "two-step packages not supported by this build"
fs = OPTIONS.source_info_dict["fstab"]["/misc"] fs = source_info["fstab"]["/misc"]
assert fs.fs_type.upper() == "EMMC", \ assert fs.fs_type.upper() == "EMMC", \
"two-step packages only supported on devices with EMMC /misc partitions" "two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev" : fs.device} bcb_dev = {"bcb_dev" : fs.device}
@ -1049,7 +1049,6 @@ else
if OPTIONS.wipe_user_data: if OPTIONS.wipe_user_data:
script.Print("Erasing user data...") script.Print("Erasing user data...")
script.FormatPartition("/data") script.FormatPartition("/data")
metadata["ota-wipe"] = "yes"
if OPTIONS.two_step: if OPTIONS.two_step:
script.AppendExtra(""" script.AppendExtra("""
@ -1200,7 +1199,6 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
if OPTIONS.wipe_user_data: if OPTIONS.wipe_user_data:
with open(properties_file, "a") as f: with open(properties_file, "a") as f:
f.write("POWERWASH=1\n") f.write("POWERWASH=1\n")
metadata["ota-wipe"] = "yes"
# Add the signed payload file and properties into the zip. In order to # Add the signed payload file and properties into the zip. In order to
# support streaming, we pack payload.bin, payload_properties.txt and # support streaming, we pack payload.bin, payload_properties.txt and