diff options
| author | Tao Bao <tbao@google.com> | 2015-03-20 03:27:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 03:27:55 +0000 |
| commit | 928b851ca178733ba61eef72a1b7e004f9a111e7 (patch) | |
| tree | 5869f15d1cb5765f2b4cec992650428b82f1dae3 /tools/releasetools/blockimgdiff.py | |
| parent | ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b (diff) | |
| parent | ae9787514d5709dff766f4791c00a4875eebbf50 (diff) | |
| download | build-928b851ca178733ba61eef72a1b7e004f9a111e7.zip build-928b851ca178733ba61eef72a1b7e004f9a111e7.tar.gz build-928b851ca178733ba61eef72a1b7e004f9a111e7.tar.bz2 | |
am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"
* commit 'ae9787514d5709dff766f4791c00a4875eebbf50':
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 7181475..f031078 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 = [] |