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

Side by Side Diff: build/android/pylib/__init__.py

Issue 2593903002: [android] Use contextlib_ext.Optional for conditional context managers. (Closed)
Patch Set: Created 4 years 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 import sys 6 import sys
7 7
8 _DEVIL_PATH = os.path.abspath(os.path.join( 8 _CATAPULT_PATH = os.path.abspath(os.path.join(
rnephew (Reviews Here) 2016/12/21 16:00:56 I'm guessing this will hit some merge conflicts wi
9 os.path.dirname(__file__), '..', '..', '..', 'third_party', 'catapult', 9 os.path.dirname(__file__), '..', '..', '..', 'third_party', 'catapult'))
10 'devil')) 10 _DEVIL_PATH = os.path.join(_CATAPULT_PATH, 'devil')
11 _PY_TRACE_EVENT_PATH = os.path.join(_CATAPULT_PATH, 'common', 'py_trace_event')
12 _PY_UTILS_PATH = os.path.join(_CATAPULT_PATH, 'common', 'py_utils')
11 13
12 _PYTRACE_PATH = os.path.abspath(os.path.join( 14 if _PY_UTILS_PATH not in sys.path:
13 os.path.dirname(__file__), '..', '..', '..', 'third_party', 'catapult', 15 sys.path.append(_PY_UTILS_PATH)
14 'common', 'py_trace_event'))
15 16
16 if _DEVIL_PATH not in sys.path: 17 if _DEVIL_PATH not in sys.path:
17 sys.path.append(_DEVIL_PATH) 18 sys.path.append(_DEVIL_PATH)
18 19
19 if _PYTRACE_PATH not in sys.path: 20 if _PY_TRACE_EVENT_PATH not in sys.path:
20 sys.path.append(_PYTRACE_PATH) 21 sys.path.append(_PY_TRACE_EVENT_PATH)
OLDNEW
« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/pylib/local/device/local_device_perf_test_run.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698