resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev

Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
2015-07-01 17:44:53 -07:00
parent 78d1cba0f4 7f9470cda3
commit 8787cd6d4e
1 changed files with 6 additions and 2 deletions
--- a/tools/releasetools/sparse_img.py
+++ b/tools/releasetools/sparse_img.py
@@ -201,8 +201,12 @@ class SparseImage(object):
          nonzero_blocks.append(b)
          nonzero_blocks.append(b+1)

-    out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
-    out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)
+    assert zero_blocks or nonzero_blocks
+
+    if zero_blocks:
+      out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
+    if nonzero_blocks:
+      out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)

  def ResetFileMap(self):
    """Throw away the file map and treat the entire image as