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

build/android/pylib/local/device/local_device_test_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 fnmatch
 import imp
 import logging
+import posixpath
 import signal
 import thread
 import threading
 
 from devil.utils import signal_handler
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.base import test_collection
 from pylib.local.device import local_device_environment
@@ skipping 19 matching lines @@
                     installer_script)
   params = install_wrapper.GetInstallParameters()
 
   from incremental_install import installer
   installer.Install(device, apk_helper, split_globs=params['splits'],
                     native_libs=params['native_libs'],
                     dex_files=params['dex_files'],
                     permissions=None)  # Auto-grant permissions from manifest.
 
 
+def SubstituteDeviceRoot(device_path, device_root):
+  if not device_path:
+    return device_root
+  elif isinstance(device_path, list):
+    return posixpath.join(*(p if p else device_root for p in device_path))
+  else:
+    return device_path
+
+
 class LocalDeviceTestRun(test_run.TestRun):
 
   def __init__(self, env, test_instance):
     super(LocalDeviceTestRun, self).__init__(env, test_instance)
     self._tools = {}
 
   #override
   def RunTests(self):
     tests = self._GetTests()
 
@@ skipping 130 matching lines @@
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError
 
 
 class NoTestsError(Exception):
   """Error for when no tests are found."""