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

Merge \\"Remove --no_prereq flag from OTA script.\\" am: bc450fc9c8

Browse Source 
am: bd30d5fa16

Change-Id: Ic083c9b038bd5a31f9b52ebd6fc498e0353239ca
This commit is contained in:
Elliott Hughes
2016-06-21 00:08:23 +00:00
committed by android-build-merger
parent e79e98a6e7 bd30d5fa16
commit 38f9a845ca
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/releasetools/ota_from_target_files.py
View File

@@ -64,11 +64,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
Generate an OTA package that will wipe the user data partition Generate an OTA package that will wipe the user data partition
when installed. when installed.
-n (--no_prereq)
Omit the timestamp prereq check normally included at the top of
the build scripts (used for developer OTA packages which
legitimately need to go back and forth).
--downgrade --downgrade
Intentionally generate an incremental OTA that updates from a newer Intentionally generate an incremental OTA that updates from a newer
build to an older one (based on timestamp comparison). "post-timestamp" build to an older one (based on timestamp comparison). "post-timestamp"
@@ -139,7 +134,6 @@ OPTIONS.require_verbatim = set()
OPTIONS.prohibit_verbatim = set(("system/build.prop",)) OPTIONS.prohibit_verbatim = set(("system/build.prop",))
OPTIONS.patch_threshold = 0.95 OPTIONS.patch_threshold = 0.95
OPTIONS.wipe_user_data = False OPTIONS.wipe_user_data = False
OPTIONS.omit_prereq = False
OPTIONS.downgrade = False OPTIONS.downgrade = False
OPTIONS.extra_script = None OPTIONS.extra_script = None
OPTIONS.aslr_mode = True OPTIONS.aslr_mode = True
@@ -561,10 +555,9 @@ def WriteFullOTAPackage(input_zip, output_zip):
metadata["ota-type"] = "BLOCK" if block_based else "FILE" metadata["ota-type"] = "BLOCK" if block_based else "FILE"
if not OPTIONS.omit_prereq: ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict)
ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict) ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict)
ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict) script.AssertOlderBuild(ts, ts_text)
script.AssertOlderBuild(ts, ts_text)
AppendAssertions(script, OPTIONS.info_dict, oem_dict) AppendAssertions(script, OPTIONS.info_dict, oem_dict)
device_specific.FullOTA_Assertions() device_specific.FullOTA_Assertions()
@@ -1881,8 +1874,6 @@ def main(argv):
OPTIONS.full_bootloader = True OPTIONS.full_bootloader = True
elif o in ("-w", "--wipe_user_data"): elif o in ("-w", "--wipe_user_data"):
OPTIONS.wipe_user_data = True OPTIONS.wipe_user_data = True
elif o in ("-n", "--no_prereq"):
OPTIONS.omit_prereq = True
elif o == "--downgrade": elif o == "--downgrade":
OPTIONS.downgrade = True OPTIONS.downgrade = True
OPTIONS.wipe_user_data = True OPTIONS.wipe_user_data = True
@@ -1930,7 +1921,7 @@ def main(argv):
return True return True
args = common.ParseOptions(argv, __doc__, args = common.ParseOptions(argv, __doc__,
extra_opts="b:k:i:d:wne:t:a:2o:", extra_opts="b:k:i:d:we:t:a:2o:",
extra_long_opts=[ extra_long_opts=[
"board_config=", "board_config=",
"package_key=", "package_key=",
@@ -1938,7 +1929,6 @@ def main(argv):
"full_radio", "full_radio",
"full_bootloader", "full_bootloader",
"wipe_user_data", "wipe_user_data",
"no_prereq",
"downgrade", "downgrade",
"extra_script=", "extra_script=",
"worker_threads=", "worker_threads=",
@@ -1969,8 +1959,7 @@ def main(argv):
# Otherwise the device may go back from arbitrary build with this full # Otherwise the device may go back from arbitrary build with this full
# OTA package. # OTA package.
if OPTIONS.incremental_source is None: if OPTIONS.incremental_source is None:
raise ValueError("Cannot generate downgradable full OTAs - consider" raise ValueError("Cannot generate downgradable full OTAs")
"using --omit_prereq?")
# Load the dict file from the zip directly to have a peek at the OTA type. # Load the dict file from the zip directly to have a peek at the OTA type.
# For packages using A/B update, unzipping is not needed. # For packages using A/B update, unzipping is not needed.