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_common.py

diff --git a/tools/releasetools/test_common.py b/tools/releasetools/test_common.py
index 50fa86f..c0ebd89 100644
--- a/tools/releasetools/test_common.py
+++ b/tools/releasetools/test_common.py
@@ -25,9 +25,9 @@
 import common
 import test_utils
 import validate_target_files
+from images import EmptyImage, DataImage
 from rangelib import RangeSet
 
-from blockimgdiff import EmptyImage, DataImage
 
 KiB = 1024
 MiB = 1024 * KiB