summaryrefslogtreecommitdiffstats
path: root/build/android/pylib/linker/setup.py
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2016-01-11 08:22:59 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-11 16:23:48 +0000
commitd28554a567ddb871196a9268c1d76d8a0061370b (patch)
tree60458b3bb1976ca39f38720faaef6ecce729c704 /build/android/pylib/linker/setup.py
parentf211b743e659391cf5b674dfe2ea29f6b0fe2b29 (diff)
downloadchromium_src-d28554a567ddb871196a9268c1d76d8a0061370b.zip
chromium_src-d28554a567ddb871196a9268c1d76d8a0061370b.tar.gz
chromium_src-d28554a567ddb871196a9268c1d76d8a0061370b.tar.bz2
[Android] Prepare build/android/ for catapult+devil.
BUG=476719 Review URL: https://codereview.chromium.org/1571803002 Cr-Commit-Position: refs/heads/master@{#368599}
Diffstat (limited to 'build/android/pylib/linker/setup.py')
-rw-r--r--build/android/pylib/linker/setup.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/build/android/pylib/linker/setup.py b/build/android/pylib/linker/setup.py
index e561957..3f380ea 100644
--- a/build/android/pylib/linker/setup.py
+++ b/build/android/pylib/linker/setup.py
@@ -5,17 +5,13 @@
"""Setup for linker tests."""
import logging
-import os
-import sys
-from pylib import constants
+from pylib.constants import host_paths
from pylib.linker import test_case
from pylib.linker import test_runner
-sys.path.insert(0,
- os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
- 'common'))
-import unittest_util # pylint: disable=F0401
+with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
+ import unittest_util # pylint: disable=import-error
# ModernLinker requires Android M (API level 23) or later.
_VERSION_SDK_PROPERTY = 'ro.build.version.sdk'