Commit c955f96e authored by bulach@chromium.org's avatar bulach@chromium.org

Android: removes hardcoded out directory in test_server.py

Use the one defined in constants.py instead.

BUG=
TEST=build/android/test_runner.py instrumentation --test-apk ChromiumTestShellTest --test_data chrome:chrome/test/data/android/device_files --verbose --host-driven-root=chrome/android -f testDisableAndEnableSync --python-only

Review URL: https://codereview.chromium.org/59713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233057 0039d316-1c4b-4281-b951-d872f2087c98
parent 58d9ba32
...@@ -70,7 +70,7 @@ class TestServer(object): ...@@ -70,7 +70,7 @@ class TestServer(object):
# Make dirs into a list of absolute paths. # Make dirs into a list of absolute paths.
abs_dirs = [os.path.join(src_dir, d) for d in _PYTHONPATH_DIRS] abs_dirs = [os.path.join(src_dir, d) for d in _PYTHONPATH_DIRS]
# Add the generated python files to the path # Add the generated python files to the path
abs_dirs.extend([os.path.join(src_dir, 'out', constants.GetBuildType(), d) abs_dirs.extend([os.path.join(src_dir, constants.GetOutDirectory(), d)
for d in _GENERATED_PYTHONPATH_DIRS]) for d in _GENERATED_PYTHONPATH_DIRS])
current_python_path = os.environ.get('PYTHONPATH') current_python_path = os.environ.get('PYTHONPATH')
extra_python_path = ':'.join(abs_dirs) extra_python_path = ':'.join(abs_dirs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment