Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a52f97 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Remove --no_prereq flag from OTA script. 

Bug: http://b/29393071
Test: aosp_flounder "make dist"
Change-Id: I9ec85210e118f7e525291e31ab4081a2bd10f998
parent ee199c49

tools/releasetools/ota_from_target_files.py

+5 −16
Original line number Diff line number Diff line
@@ -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

      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

      Intentionally generate an incremental OTA that updates from a newer

      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.patch_threshold = 0.95

OPTIONS.wipe_user_data = False

OPTIONS.omit_prereq = False

OPTIONS.downgrade = False

OPTIONS.extra_script = None

OPTIONS.aslr_mode = True
@@ -561,7 +555,6 @@ def WriteFullOTAPackage(input_zip, output_zip): 


  metadata["ota-type"] = "BLOCK" if block_based else "FILE"



  if not OPTIONS.omit_prereq:

  ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict)

  ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict)

  script.AssertOlderBuild(ts, ts_text)
@@ -1861,8 +1854,6 @@ def main(argv): 
      OPTIONS.full_bootloader = True

    elif o in ("-w", "--wipe_user_data"):

      OPTIONS.wipe_user_data = True

    elif o in ("-n", "--no_prereq"):

      OPTIONS.omit_prereq = True

    elif o == "--downgrade":

      OPTIONS.downgrade = True

      OPTIONS.wipe_user_data = True
@@ -1910,7 +1901,7 @@ def main(argv): 
    return True



  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=[

                                 "board_config=",

                                 "package_key=",
@@ -1918,7 +1909,6 @@ def main(argv): 
                                 "full_radio",

                                 "full_bootloader",

                                 "wipe_user_data",

                                 "no_prereq",

                                 "downgrade",

                                 "extra_script=",

                                 "worker_threads=",
@@ -1949,8 +1939,7 @@ def main(argv): 
    # Otherwise the device may go back from arbitrary build with this full

    # OTA package.

    if OPTIONS.incremental_source is None:

      raise ValueError("Cannot generate downgradable full OTAs - consider"

                       "using --omit_prereq?")

      raise ValueError("Cannot generate downgradable full OTAs")



  # 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.