diff options
| author | Tao Bao <tbao@google.com> | 2015-03-20 03:33:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 03:33:21 +0000 |
| commit | b71d6090618822ffb1eb698ba61bed4278c4ca5b (patch) | |
| tree | d5662f703a4b622449429f1382270109610531ea /tools/releasetools/blockimgdiff.py | |
| parent | e6a3ff8d52260e62df849ce0343ce24768d58fa0 (diff) | |
| parent | 928b851ca178733ba61eef72a1b7e004f9a111e7 (diff) | |
| download | build-b71d6090618822ffb1eb698ba61bed4278c4ca5b.zip build-b71d6090618822ffb1eb698ba61bed4278c4ca5b.tar.gz build-b71d6090618822ffb1eb698ba61bed4278c4ca5b.tar.bz2 | |
am 928b851c: am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"
* commit '928b851ca178733ba61eef72a1b7e004f9a111e7':
Make the generated OTAs repeatable
Diffstat (limited to 'tools/releasetools/blockimgdiff.py')
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py index 5cf0f2d..5b5c4cc 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -140,8 +140,11 @@ class Transfer(object): self.style = style self.intact = (getattr(tgt_ranges, "monotonic", False) and getattr(src_ranges, "monotonic", False)) - self.goes_before = {} - self.goes_after = {} + + # We use OrderedDict rather than dict so that the output is repeatable; + # otherwise it would depend on the hash values of the Transfer objects. + self.goes_before = OrderedDict() + self.goes_after = OrderedDict() self.stash_before = [] self.use_stash = [] |