diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-09-16 01:48:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 01:48:58 +0000 |
commit | b00f80cc6554b9c605a16caf63788647e7501641 (patch) | |
tree | 482c8e1f5f5b453922515d5a55f9427c10036eed /tools | |
parent | 15b0d0c8e15418e64e99eee3c0e4a43883a6e8fc (diff) | |
parent | a0abf49d2bdc42c81e5f636e54da9038de9dfc21 (diff) | |
download | build-b00f80cc6554b9c605a16caf63788647e7501641.zip build-b00f80cc6554b9c605a16caf63788647e7501641.tar.gz build-b00f80cc6554b9c605a16caf63788647e7501641.tar.bz2 |
am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev
* commit 'a0abf49d2bdc42c81e5f636e54da9038de9dfc21':
Add an option to include a full bootloader in incremental OTA.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 25e3724..e5a30ad 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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, 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) Remount and verify the checksums of the files written to the system and vendor (if used) partitions. Incremental builds only. @@ -125,11 +130,11 @@ OPTIONS.updater_binary = None OPTIONS.oem_source = None OPTIONS.fallback_to_full = True OPTIONS.full_radio = False +OPTIONS.full_bootloader = False # Stash size cannot exceed cache_size * threshold. OPTIONS.cache_size = None OPTIONS.stash_threshold = 0.8 - def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest value. Returns 'default' if the dict is empty.""" @@ -1506,6 +1511,8 @@ def main(argv): OPTIONS.incremental_source = a elif o == "--full_radio": OPTIONS.full_radio = True + 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"): @@ -1554,6 +1561,7 @@ def main(argv): "package_key=", "incremental_from=", "full_radio", + "full_bootloader", "wipe_user_data", "no_prereq", "extra_script=", |