Revert of [android] Stop using isolate.py for data dependency management.

build/android/pylib/instrumentation/instrumentation_test_instance.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index f8d37e76c0223bc5b3f001268120ccd5cbca42e7..566eb6ead7649ecd8e829042d075d13e4038dc41 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -18,6 +18,7 @@ from pylib.base import test_instance
 from pylib.constants import host_paths
 from pylib.instrumentation import test_result
 from pylib.instrumentation import instrumentation_parser
+from pylib.utils import isolator
 from pylib.utils import proguard
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
@@ -399,7 +400,7 @@ def GetUniqueTestName(test, sep='#'):
 
 class InstrumentationTestInstance(test_instance.TestInstance):
 
-  def __init__(self, args, data_deps_delegate, error_func):
+  def __init__(self, args, isolate_delegate, error_func):
     super(InstrumentationTestInstance, self).__init__()
 
     self._additional_apks = []
@@ -416,9 +417,10 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     self._initializeApkAttributes(args, error_func)
 
     self._data_deps = None
-    self._data_deps_delegate = None
-    self._runtime_deps_path = None
-    self._initializeDataDependencyAttributes(args, data_deps_delegate)
+    self._isolate_abs_path = None
+    self._isolate_delegate = None
+    self._isolated_abs_path = None
+    self._initializeDataDependencyAttributes(args, isolate_delegate)
 
     self._annotations = None
     self._excluded_annotations = None
@@ -518,12 +520,22 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     self._additional_apks = (
         [apk_helper.ToHelper(x) for x in args.additional_apks])
 
-  def _initializeDataDependencyAttributes(self, args, data_deps_delegate):
+  def _initializeDataDependencyAttributes(self, args, isolate_delegate):
     self._data_deps = []
-    self._data_deps_delegate = data_deps_delegate
-    self._runtime_deps_path = args.runtime_deps_path
+    if (args.isolate_file_path and
+        not isolator.IsIsolateEmpty(args.isolate_file_path)):
+      if os.path.isabs(args.isolate_file_path):
+        self._isolate_abs_path = args.isolate_file_path
+      else:
+        self._isolate_abs_path = os.path.join(
+            constants.DIR_SOURCE_ROOT, args.isolate_file_path)
+      self._isolate_delegate = isolate_delegate
+      self._isolated_abs_path = os.path.join(
+          constants.GetOutDirectory(), '%s.isolated' % self._test_package)
+    else:
+      self._isolate_delegate = None
 
-    if not self._runtime_deps_path:
+    if not self._isolate_delegate:
       logging.warning('No data dependencies will be pushed.')
 
   def _initializeTestFilterAttributes(self, args):
@@ -676,8 +688,11 @@ class InstrumentationTestInstance(test_instance.TestInstance):
 
   #override
   def SetUp(self):
-    self._data_deps.extend(
-        self._data_deps_delegate(self._runtime_deps_path))
+    if self._isolate_delegate:
+      self._isolate_delegate.Remap(
+          self._isolate_abs_path, self._isolated_abs_path)
+      self._isolate_delegate.MoveOutputDeps()
+      self._data_deps.extend([(self._isolate_delegate.isolate_deps_dir, None)])
 
   def GetDataDependencies(self):
     return self._data_deps
@@ -749,4 +764,5 @@ class InstrumentationTestInstance(test_instance.TestInstance):
 
   #override
   def TearDown(self):
-    pass
+    if self._isolate_delegate:
+      self._isolate_delegate.Clear()