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

build/android/pylib/local/device/local_device_gtest_run.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import itertools
 import logging
 import os
 import posixpath
 
@@ skipping 233 matching lines @@
     self._servers = collections.defaultdict(list)
 
   #override
   def TestPackage(self):
     return self._test_instance.suite
 
   #override
   def SetUp(self):
     @local_device_environment.handle_shard_failures_with(
         on_failure=self._env.BlacklistDevice)
-    def individual_device_set_up(dev, host_device_tuples):
+    def individual_device_set_up(dev):
       def install_apk():
         # Install test APK.
         self._delegate.Install(dev)
 
       def push_test_data():
         # Push data dependencies.
         device_root = self._delegate.GetTestDataRoot(dev)
-        host_device_tuples_substituted = [
-            (h, local_device_test_run.SubstituteDeviceRoot(d, device_root))
-            for h, d in host_device_tuples]
-        dev.PushChangedFiles(
-            host_device_tuples_substituted,
-            delete_device_stale=True)
+        data_deps = self._test_instance.GetDataDependencies()
+        host_device_tuples = [
+            (h, d if d is not None else device_root)
+            for h, d in data_deps]
+        dev.PushChangedFiles(host_device_tuples, delete_device_stale=True)
         if not host_device_tuples:
           dev.RunShellCommand(['rm', '-rf', device_root], check_return=True)
           dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True)
 
       def init_tool_and_start_servers():
         tool = self.GetTool(dev)
         tool.CopyFiles(dev)
         tool.SetupEnvironment()
 
         self._servers[str(dev)] = []
         if self.TestPackage() in _SUITE_REQUIRES_TEST_SERVER_SPAWNER:
           self._servers[str(dev)].append(
               local_test_server_spawner.LocalTestServerSpawner(
                   ports.AllocateTestServerPort(), dev, tool))
 
         for s in self._servers[str(dev)]:
           s.SetUp()
 
       steps = (install_apk, push_test_data, init_tool_and_start_servers)
       if self._env.concurrent_adb:
         reraiser_thread.RunAsync(steps)
       else:
         for step in steps:
           step()
 
-    self._env.parallel_devices.pMap(
-        individual_device_set_up,
-        self._test_instance.GetDataDependencies())
+    self._env.parallel_devices.pMap(individual_device_set_up)
 
   #override
   def _ShouldShard(self):
     return True
 
   #override
   def _CreateShards(self, tests):
     # _crashes are tests that might crash and make the tests in the same shard
     # following the crashed testcase not run.
     # Thus we need to create separate shards for each crashed testcase,
@@ skipping 110 matching lines @@
   def TearDown(self):
     @local_device_environment.handle_shard_failures
     def individual_device_tear_down(dev):
       for s in self._servers.get(str(dev), []):
         s.TearDown()
 
       tool = self.GetTool(dev)
       tool.CleanUpEnvironment()
 
     self._env.parallel_devices.pMap(individual_device_tear_down)