From 43078aa37aa771149bfd85d10c47cce4e818b3d4 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 21 Apr 2015 14:32:35 -0700 Subject: [PATCH] Add support for full radio option Occasionally we need to include full radio image in incremental OTAs. Adding --full_radio option to support that. It needs matching changes in the releasetools.py in the target_files zip, which comes from device///releasetools.py. Bug: 19994922 Change-Id: Id1fb3a9cdb7e67dd9dbadd8fb6cd5fccd358820e --- tools/releasetools/ota_from_target_files.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 21565fcfd..eab3daa87 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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_radio + When generating an incremental OTA, always include a full copy of + radio image. This option is only meaningful when -i is specified, + because a full radio 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. @@ -117,6 +122,7 @@ OPTIONS.block_based = False OPTIONS.updater_binary = None OPTIONS.oem_source = None OPTIONS.fallback_to_full = True +OPTIONS.full_radio = False def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest @@ -1456,6 +1462,8 @@ def main(argv): OPTIONS.package_key = a elif o in ("-i", "--incremental_from"): OPTIONS.incremental_source = a + elif o == "--full_radio": + OPTIONS.full_radio = True elif o in ("-w", "--wipe_user_data"): OPTIONS.wipe_user_data = True elif o in ("-n", "--no_prereq"): @@ -1497,6 +1505,7 @@ def main(argv): "board_config=", "package_key=", "incremental_from=", + "full_radio", "wipe_user_data", "no_prereq", "extra_script=",