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

build/android/pylib/results/flakiness_dashboard/results_uploader.py

 # Copyright (c) 2012 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.
 
 """Uploads the results to the flakiness dashboard server."""
 # pylint: disable=E1002,R0201
 
 import logging
 import os
 import shutil
 import tempfile
 import xml
 
 
 from devil.utils import cmd_helper
-from pylib import constants
+from pylib.constants import host_paths
 from pylib.results.flakiness_dashboard import json_results_generator
 from pylib.utils import repo_utils
 
 
 
 class JSONResultsGenerator(json_results_generator.JSONResultsGeneratorBase):
   """Writes test results to a JSON file and handles uploading that file to
   the test results server.
   """
   def __init__(self, builder_name, build_name, build_number, tmp_folder,
@@ skipping 27 matching lines @@
     """
     def _is_git_directory(in_directory):
       """Returns true if the given directory is in a git repository.
 
       Args:
         in_directory: The directory path to be tested.
       """
       if os.path.exists(os.path.join(in_directory, '.git')):
         return True
       parent = os.path.dirname(in_directory)
-      if parent == constants.DIR_SOURCE_ROOT or parent == in_directory:
+      if parent == host_paths.DIR_SOURCE_ROOT or parent == in_directory:
         return False
       return _is_git_directory(parent)
 
-    in_directory = os.path.join(constants.DIR_SOURCE_ROOT, in_directory)
+    in_directory = os.path.join(host_paths.DIR_SOURCE_ROOT, in_directory)
 
     if not os.path.exists(os.path.join(in_directory, '.svn')):
       if _is_git_directory(in_directory):
         return repo_utils.GetGitHeadSHA1(in_directory)
       else:
         return ''
 
     output = cmd_helper.GetCmdOutput(['svn', 'info', '--xml'], cwd=in_directory)
     try:
       dom = xml.dom.minidom.parseString(output)
@@ skipping 13 matching lines @@
     if not self._build_number or not self._builder_name:
       raise Exception('You should not be uploading tests results to the server'
                       'from your local machine.')
 
     upstream = (tests_type != 'Chromium_Android_Instrumentation')
     if upstream:
       # TODO(frankf): Use factory properties (see buildbot/bb_device_steps.py)
       # This requires passing the actual master name (e.g. 'ChromiumFYI' not
       # 'chromium.fyi').
       from slave import slave_utils # pylint: disable=F0401
-      self._build_name = slave_utils.SlaveBuildName(constants.DIR_SOURCE_ROOT)
+      self._build_name = slave_utils.SlaveBuildName(host_paths.DIR_SOURCE_ROOT)
       self._master_name = slave_utils.GetActiveMaster()
     else:
       self._build_name = 'chromium-android'
       buildbot_branch = os.environ.get('BUILDBOT_BRANCH')
       if not buildbot_branch:
         buildbot_branch = 'master'
       else:
         # Ensure there's no leading "origin/"
         buildbot_branch = buildbot_branch[buildbot_branch.find('/') + 1:]
       self._master_name = '%s-%s' % (self._build_name, buildbot_branch)
@@ skipping 59 matching lines @@
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
     results: test results.
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)