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'." am: 76c6906bf2 am: 6c83183400 

am: 73b6f5d661

Change-Id: Ia918010e2c40dd39bd37042d7457fb66f0e7f6da
This commit is contained in:
Tao Bao 2018-02-02 20:17:50 +00:00 committed by android-build-merger
parent 91391637f9 73b6f5d661
commit 4258bcc17b
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 not source_info.get("multistage_support"):
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", \
"two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev" : fs.device}
@ -1049,7 +1049,6 @@ else
if OPTIONS.wipe_user_data:
script.Print("Erasing user data...")
script.FormatPartition("/data")
metadata["ota-wipe"] = "yes"
if OPTIONS.two_step:
script.AppendExtra("""
@ -1205,7 +1204,6 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
if OPTIONS.wipe_user_data:
with open(properties_file, "a") as f:
f.write("POWERWASH=1\n")
metadata["ota-wipe"] = "yes"
# Add the signed payload file and properties into the zip. In order to
# support streaming, we pack payload.bin, payload_properties.txt and