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

Commit f4fc29b0 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android Git Automerger
Browse files

am b00f80cc: am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev

* commit 'b00f80cc':
  Add an option to include a full bootloader in incremental OTA.
parents 1ed87fa4 b00f80cc
Loading
Loading
Loading
Loading
+9 −1
Original line number Original line Diff line number Diff line
@@ -42,6 +42,11 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
      radio image. This option is only meaningful when -i is specified,
      radio image. This option is only meaningful when -i is specified,
      because a full radio is always included in a full OTA if applicable.
      because a full radio is always included in a full OTA if applicable.


 --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.
@@ -125,11 +130,11 @@ OPTIONS.updater_binary = None
OPTIONS.oem_source = None
OPTIONS.oem_source = None
OPTIONS.fallback_to_full = True
OPTIONS.fallback_to_full = True
OPTIONS.full_radio = False
OPTIONS.full_radio = False
OPTIONS.full_bootloader = False
# Stash size cannot exceed cache_size * threshold.
# Stash size cannot exceed cache_size * threshold.
OPTIONS.cache_size = None
OPTIONS.cache_size = None
OPTIONS.stash_threshold = 0.8
OPTIONS.stash_threshold = 0.8



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
  value.  Returns 'default' if the dict is empty."""
  value.  Returns 'default' if the dict is empty."""
@@ -1506,6 +1511,8 @@ def main(argv):
      OPTIONS.incremental_source = a
      OPTIONS.incremental_source = a
    elif o == "--full_radio":
    elif o == "--full_radio":
      OPTIONS.full_radio = True
      OPTIONS.full_radio = True
    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"):
@@ -1554,6 +1561,7 @@ def main(argv):
                                 "package_key=",
                                 "package_key=",
                                 "incremental_from=",
                                 "incremental_from=",
                                 "full_radio",
                                 "full_radio",
                                 "full_bootloader",
                                 "wipe_user_data",
                                 "wipe_user_data",
                                 "no_prereq",
                                 "no_prereq",
                                 "extra_script=",
                                 "extra_script=",