diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sac/head_tag.cs | 2 | ||||
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 12 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 9 | ||||
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 9 |
4 files changed, 28 insertions, 4 deletions
diff --git a/tools/droiddoc/templates-sac/head_tag.cs b/tools/droiddoc/templates-sac/head_tag.cs index 9fca488..5cee68c 100644 --- a/tools/droiddoc/templates-sac/head_tag.cs +++ b/tools/droiddoc/templates-sac/head_tag.cs @@ -7,7 +7,7 @@ <title><?cs if:page.title ?><?cs var:page.title ?> | <?cs - /if ?>Android Developers</title> + /if ?>Android Open Source Project</title> <!-- STYLESHEETS --> <link rel="stylesheet" diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py index bb9cdb3..d549f70 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -387,6 +387,12 @@ class BlockImageDiff(object): xf.style, xf.tgt_ranges.to_string_raw(), src_str)) elif self.version >= 3: + # take into account automatic stashing of overlapping blocks + if xf.src_ranges.overlaps(xf.tgt_ranges): + temp_stash_usage = stashed_blocks + xf.src_ranges.size(); + if temp_stash_usage > max_stashed_blocks: + max_stashed_blocks = temp_stash_usage + out.append("%s %s %s %s\n" % ( xf.style, self.HashBlocks(self.tgt, xf.tgt_ranges), @@ -405,6 +411,12 @@ class BlockImageDiff(object): xf.style, xf.patch_start, xf.patch_len, xf.tgt_ranges.to_string_raw(), src_str)) elif self.version >= 3: + # take into account automatic stashing of overlapping blocks + if xf.src_ranges.overlaps(xf.tgt_ranges): + temp_stash_usage = stashed_blocks + xf.src_ranges.size(); + if temp_stash_usage > max_stashed_blocks: + max_stashed_blocks = temp_stash_usage + out.append("%s %d %d %s %s %s %s\n" % ( xf.style, xf.patch_start, xf.patch_len, diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 6a5d22f..a8b0035 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1140,10 +1140,13 @@ class BlockDifference(object): script.Print("Image %s will be patched unconditionally." % (partition,)) else: if self.version >= 3: - script.AppendExtra(('if block_image_verify("%s", ' + script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || ' + 'block_image_verify("%s", ' 'package_extract_file("%s.transfer.list"), ' - '"%s.new.dat", "%s.patch.dat") then') % - (self.device, partition, partition, partition)) + '"%s.new.dat", "%s.patch.dat")) then') % ( + self.device, self.src.care_map.to_string_raw(), + self.src.TotalSha1(), + self.device, partition, partition, partition)) else: script.AppendExtra('if range_sha1("%s", "%s") == "%s" then' % ( self.device, self.src.care_map.to_string_raw(), diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 21565fc..eab3daa 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=", |