commit 41976c725ca676dfe6d3ec22732065bab06462c2
author Tianjie Xu <xunchang@google.com> Wed Jul 03 13:57:01 2019 -0700
committer Tianjie Xu <xunchang@google.com> Mon Jul 15 17:02:23 2019 -0700
tree 1f3187a66ad1bd5df130213644644513651b26b6
parent 2b4828a56494c69d4c531baa6f48ba5af121febd

Factor out the image classes to break circular dependency

This helps to break the circular dependency between common and
blockimgdiff.

Bug: 32379627
Test: unit tests pass
Change-Id: I90b5ff34782acbfac86f36265bd96c207d898bf6

tools/releasetools/test_blockimgdiff.py

diff --git a/tools/releasetools/test_blockimgdiff.py b/tools/releasetools/test_blockimgdiff.py
index 4c86933..0987dcf 100644
--- a/tools/releasetools/test_blockimgdiff.py
+++ b/tools/releasetools/test_blockimgdiff.py
@@ -18,9 +18,8 @@
 from hashlib import sha1
 
 import common
-from blockimgdiff import (
-    BlockImageDiff, DataImage, EmptyImage, FileImage, HeapItem, ImgdiffStats,
-    Transfer)
+from blockimgdiff import BlockImageDiff, HeapItem, ImgdiffStats, Transfer
+from images import DataImage, EmptyImage, FileImage
 from rangelib import RangeSet
 from test_utils import ReleaseToolsTestCase