[Android] Prepare build/android/ for catapult+devil.

build/android/pylib/gtest/gtest_test_instance.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 logging
 import os
 import re
-import sys
 import tempfile
 
 from devil.android import apk_helper
 from pylib import constants
+from pylib.constants import host_paths
 from pylib.base import base_test_result
 from pylib.base import test_instance
 
-sys.path.append(os.path.join(
-    constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))
-import unittest_util # pylint: disable=import-error
+with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
+  import unittest_util # pylint: disable=import-error
 
 
 BROWSER_TEST_SUITES = [
   'components_browsertests',
   'content_browsertests',
 ]
 
 RUN_IN_SUB_THREAD_TEST_SUITES = ['net_unittests']
 
 
@@ skipping 140 matching lines @@
     elif args.test_filter_file:
       with open(args.test_filter_file, 'r') as f:
         self._gtest_filter = ':'.join(l.strip() for l in f)
     else:
       self._gtest_filter = None
 
     if not args.isolate_file_path:
       default_isolate_file_path = _DEFAULT_ISOLATE_FILE_PATHS.get(self._suite)
       if default_isolate_file_path:
         args.isolate_file_path = os.path.join(
-            constants.DIR_SOURCE_ROOT, default_isolate_file_path)
+            host_paths.DIR_SOURCE_ROOT, default_isolate_file_path)
 
     if args.isolate_file_path:
       self._isolate_abs_path = os.path.abspath(args.isolate_file_path)
       self._isolate_delegate = isolate_delegate
       self._isolated_abs_path = os.path.join(
           constants.GetOutDirectory(), '%s.isolated' % self._suite)
     else:
       logging.warning('No isolate file provided. No data deps will be pushed.')
       self._isolate_delegate = None
 
@@ skipping 118 matching lines @@
 
   def _GenerateDisabledFilterString(self, disabled_prefixes):
     disabled_filter_items = []
 
     if disabled_prefixes is None:
       disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
     disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes]
     disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes]
 
     disabled_tests_file_path = os.path.join(
-        constants.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest',
+        host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest',
         'filter', '%s_disabled' % self._suite)
     if disabled_tests_file_path and os.path.exists(disabled_tests_file_path):
       with open(disabled_tests_file_path) as disabled_tests_file:
         disabled_filter_items += [
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   # pylint: disable=no-self-use
@@ skipping 32 matching lines @@
         result_type = None
 
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()