am 46d5efcd: Add an option to include a full bootloader in incremental OTA.

* commit '46d5efcd0d451a48cc793931efef2b1ca982386d':
  Add an option to include a full bootloader in incremental OTA.

tools/releasetools/ota_from_target_files

@@ -37,6 +37,11 @@ Usage:  ota_from_target_files [flags] input_target_files output_ota_package
       Generate an incremental OTA using the given target-files zip as
       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)
       Remount and verify the checksums of the files written to the
       system and vendor (if used) partitions.  Incremental builds only.
@@ -125,6 +130,7 @@ OPTIONS.block_based = False
 OPTIONS.updater_binary = None
 OPTIONS.oem_source = None
 OPTIONS.fallback_to_full = True
+OPTIONS.full_bootloader = False
 
 def MostPopularKey(d, default):
   """Given a dict, return the key corresponding to the largest
@@ -1420,6 +1426,8 @@ def main(argv):
       OPTIONS.package_key = a
     elif o in ("-i", "--incremental_from"):
       OPTIONS.incremental_source = a
+    elif o == "--full_bootloader":
+      OPTIONS.full_bootloader = True
     elif o in ("-w", "--wipe_user_data"):
       OPTIONS.wipe_user_data = True
     elif o in ("-n", "--no_prereq"):
@@ -1460,6 +1468,7 @@ def main(argv):
                              extra_long_opts=["board_config=",
                                               "package_key=",
                                               "incremental_from=",
+                                              "full_bootloader",
                                               "wipe_user_data",
                                               "no_prereq",
                                               "extra_script=",