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

Side by Side Diff: build/android/buildbot/bb_device_steps.py

Issue 1314313004: [Android][telemetry] Update pylib imports for modules that moved into devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/devil/android/ports.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import collections 6 import collections
7 import glob 7 import glob
8 import hashlib 8 import hashlib
9 import json 9 import json
10 import os 10 import os
11 import random 11 import random
12 import re 12 import re
13 import shutil 13 import shutil
14 import sys 14 import sys
15 15
16 import bb_utils 16 import bb_utils
17 import bb_annotations 17 import bb_annotations
18 18
19 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) 19 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
20 import provision_devices 20 import provision_devices
21 from devil.android import device_utils
21 from pylib import constants 22 from pylib import constants
22 from pylib.device import device_utils
23 from pylib.gtest import gtest_config 23 from pylib.gtest import gtest_config
24 24
25 CHROME_SRC_DIR = bb_utils.CHROME_SRC 25 CHROME_SRC_DIR = bb_utils.CHROME_SRC
26 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR) 26 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR)
27 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR 27 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR
28 BLINK_SCRIPTS_DIR = 'third_party/WebKit/Tools/Scripts' 28 BLINK_SCRIPTS_DIR = 'third_party/WebKit/Tools/Scripts'
29 29
30 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') 30 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
31 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat') 31 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat')
32 GS_URL = 'https://storage.googleapis.com' 32 GS_URL = 'https://storage.googleapis.com'
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 732
733 if options.coverage_bucket: 733 if options.coverage_bucket:
734 setattr(options, 'coverage_dir', 734 setattr(options, 'coverage_dir',
735 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 735 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
736 736
737 MainTestWrapper(options) 737 MainTestWrapper(options)
738 738
739 739
740 if __name__ == '__main__': 740 if __name__ == '__main__':
741 sys.exit(main(sys.argv)) 741 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/devil/android/ports.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698