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

Commit 6c828d25 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8 

am: 82c2fb0e

Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9
parents 189298d5 82c2fb0e

tools/releasetools/ota_from_target_files.py

+1 −11
Original line number Original line Diff line number Diff line
@@ -75,9 +75,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
  -e  (--extra_script)  <file>

  -e  (--extra_script)  <file>

      Insert the contents of file at the end of the update script.

      Insert the contents of file at the end of the update script.





  -a  (--aslr_mode)  <on|off>

      Specify whether to turn on ASLR for the package (on by default).



  -2  (--two_step)

  -2  (--two_step)

      Generate a 'two-step' OTA package, where recovery is updated

      Generate a 'two-step' OTA package, where recovery is updated

      first, so that any changes made to the system partition are done

      first, so that any changes made to the system partition are done
@@ -148,7 +145,6 @@ OPTIONS.patch_threshold = 0.95 
OPTIONS.wipe_user_data = False

OPTIONS.wipe_user_data = False

OPTIONS.downgrade = False

OPTIONS.downgrade = False

OPTIONS.extra_script = None

OPTIONS.extra_script = None

OPTIONS.aslr_mode = True

OPTIONS.worker_threads = multiprocessing.cpu_count() // 2

OPTIONS.worker_threads = multiprocessing.cpu_count() // 2

if OPTIONS.worker_threads == 0:

if OPTIONS.worker_threads == 0:

  OPTIONS.worker_threads = 1

  OPTIONS.worker_threads = 1
@@ -1987,11 +1983,6 @@ def main(argv): 
      OPTIONS.oem_no_mount = True

      OPTIONS.oem_no_mount = True

    elif o in ("-e", "--extra_script"):

    elif o in ("-e", "--extra_script"):

      OPTIONS.extra_script = a

      OPTIONS.extra_script = a

    elif o in ("-a", "--aslr_mode"):

      if a in ("on", "On", "true", "True", "yes", "Yes"):

        OPTIONS.aslr_mode = True

      else:

        OPTIONS.aslr_mode = False

    elif o in ("-t", "--worker_threads"):

    elif o in ("-t", "--worker_threads"):

      if a.isdigit():

      if a.isdigit():

        OPTIONS.worker_threads = int(a)

        OPTIONS.worker_threads = int(a)
@@ -2029,7 +2020,7 @@ def main(argv): 
    return True

    return True





  args = common.ParseOptions(argv, __doc__,

  args = common.ParseOptions(argv, __doc__,

                             extra_opts="b:k:i:d:we:t:a:2o:",

                             extra_opts="b:k:i:d:we:t:2o:",

                             extra_long_opts=[

                             extra_long_opts=[

                                 "board_config=",

                                 "board_config=",

                                 "package_key=",

                                 "package_key=",
@@ -2040,7 +2031,6 @@ def main(argv): 
                                 "downgrade",

                                 "downgrade",

                                 "extra_script=",

                                 "extra_script=",

                                 "worker_threads=",

                                 "worker_threads=",

                                 "aslr_mode=",

                                 "two_step",

                                 "two_step",

                                 "no_signing",

                                 "no_signing",

                                 "block",

                                 "block",