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

Commit 0cec840c authored by Leo Wang's avatar Leo Wang Committed by Android Git Automerger
Browse files

am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add... 

am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."

* commit '888b6f47':
  Revert "Add an option to include a full bootloader in incremental OTA."
parents fd5330c0 888b6f47

tools/releasetools/ota_from_target_files

+0 −9
Original line number Original line Diff line number Diff line
@@ -37,11 +37,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
      Generate an incremental OTA using the given target-files zip as

      Generate an incremental OTA using the given target-files zip as

      the starting build.

      the starting build.





  --full_bootloader

      When generating an incremental OTA, always include a full copy of

      bootloader image. This option is only meaningful when -i is specified,

      because a full bootloader is always included in a full OTA if applicable.



  -v  (--verify)

  -v  (--verify)

      Remount and verify the checksums of the files written to the

      Remount and verify the checksums of the files written to the

      system and vendor (if used) partitions.  Incremental builds only.

      system and vendor (if used) partitions.  Incremental builds only.
@@ -130,7 +125,6 @@ OPTIONS.block_based = False 
OPTIONS.updater_binary = None

OPTIONS.updater_binary = None

OPTIONS.oem_source = None

OPTIONS.oem_source = None

OPTIONS.fallback_to_full = True

OPTIONS.fallback_to_full = True

OPTIONS.full_bootloader = False





def MostPopularKey(d, default):

def MostPopularKey(d, default):

  """Given a dict, return the key corresponding to the largest

  """Given a dict, return the key corresponding to the largest
@@ -1426,8 +1420,6 @@ def main(argv): 
      OPTIONS.package_key = a

      OPTIONS.package_key = a

    elif o in ("-i", "--incremental_from"):

    elif o in ("-i", "--incremental_from"):

      OPTIONS.incremental_source = a

      OPTIONS.incremental_source = a

    elif o == "--full_bootloader":

      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"):

    elif o in ("-n", "--no_prereq"):
@@ -1468,7 +1460,6 @@ def main(argv): 
                             extra_long_opts=["board_config=",

                             extra_long_opts=["board_config=",

                                              "package_key=",

                                              "package_key=",

                                              "incremental_from=",

                                              "incremental_from=",

                                              "full_bootloader",

                                              "wipe_user_data",

                                              "wipe_user_data",

                                              "no_prereq",

                                              "no_prereq",

                                              "extra_script=",

                                              "extra_script=",