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

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 15 matching lines @@
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_temp_file
 from devil.android import device_utils
 from devil.android.sdk import keyevent
 from devil.android.sdk import version_codes
 from devil.utils import run_tests_helper
 from devil.utils import timeout_retry
 from pylib import constants
 from pylib import device_settings
+from pylib.constants import host_paths
 
 _SYSTEM_WEBVIEW_PATHS = ['/system/app/webview', '/system/app/WebViewGoogle']
 _CHROME_PACKAGE_REGEX = re.compile('.*chrom.*')
 _TOMBSTONE_REGEX = re.compile('tombstone.*')
 
 
 class _DEFAULT_TIMEOUTS(object):
   # L can take a while to reboot after a wipe.
   LOLLIPOP = 600
   PRE_LOLLIPOP = 180
@@ skipping 374 matching lines @@
     device: The DeviceUtils instance for the device to which the adb_reboot
             binary should be pushed.
     target: The build target (example, Debug or Release) which helps in
             locating the adb_reboot binary.
   """
   logging.info('Will push and launch adb_reboot on %s', str(device))
   # Kill if adb_reboot is already running.
   device.KillAll('adb_reboot', blocking=True, timeout=2, quiet=True)
   # Push adb_reboot
   logging.info('  Pushing adb_reboot ...')
-  adb_reboot = os.path.join(constants.DIR_SOURCE_ROOT,
+  adb_reboot = os.path.join(host_paths.DIR_SOURCE_ROOT,
                             'out/%s/adb_reboot' % target)
   device.PushChangedFiles([(adb_reboot, '/data/local/tmp/')])
   # Launch adb_reboot
   logging.info('  Launching adb_reboot ...')
   device.RunShellCommand(
       ['/data/local/tmp/adb_reboot'],
       check_return=True)
 
 
 def _LaunchHostHeartbeat():
   # Kill if existing host_heartbeat
   KillHostHeartbeat()
   # Launch a new host_heartbeat
   logging.info('Spawning host heartbeat...')
-  subprocess.Popen([os.path.join(constants.DIR_SOURCE_ROOT,
+  subprocess.Popen([os.path.join(host_paths.DIR_SOURCE_ROOT,
                                  'build/android/host_heartbeat.py')])
 
 def KillHostHeartbeat():
   ps = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   stdout, _ = ps.communicate()
   matches = re.findall('\\n.*host_heartbeat.*', stdout)
   for match in matches:
     logging.info('An instance of host heart beart running... will kill')
     pid = re.findall(r'(\S+)', match)[1]
     subprocess.call(['kill', str(pid)])
@@ skipping 62 matching lines @@
 
   run_tests_helper.SetLogLevel(args.verbose)
 
   devil_chromium.Initialize()
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())