commit ae9787514d5709dff766f4791c00a4875eebbf50
author Tao Bao <tbao@google.com> Fri Mar 20 03:18:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 20 03:18:43 2015 +0000
tree 98b9fd75a20d1cad94d20efd91f7a08b78650689
parent f1999c8af022d295397d2c1079dbebf362d9ad37
parent 261e195dacde109d4b438d8af3e370c87b162a5d

am 261e195d: Merge "Make the generated OTAs repeatable"

* commit '261e195dacde109d4b438d8af3e370c87b162a5d':
  Make the generated OTAs repeatable

tools/releasetools/blockimgdiff.py

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 @@
     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 = []