Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Unified Diff: build/android/pylib/results/flakiness_dashboard/results_uploader.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/remote/device/appurify_sanitized.py ('k') | build/android/pylib/utils/findbugs.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/results/flakiness_dashboard/results_uploader.py
diff --git a/build/android/pylib/results/flakiness_dashboard/results_uploader.py b/build/android/pylib/results/flakiness_dashboard/results_uploader.py
index 1360b80927d16288541cc98e659fbb6180251858..71fbee19f09f7cc529eb9ffeeee10cc2aa0ad173 100644
--- a/build/android/pylib/results/flakiness_dashboard/results_uploader.py
+++ b/build/android/pylib/results/flakiness_dashboard/results_uploader.py
@@ -13,7 +13,7 @@ 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
@@ -61,11 +61,11 @@ class JSONResultsGenerator(json_results_generator.JSONResultsGeneratorBase):
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):
@@ -99,7 +99,7 @@ class ResultsUploader(object):
# 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'
« no previous file with comments | « build/android/pylib/remote/device/appurify_sanitized.py ('k') | build/android/pylib/utils/findbugs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698