build/android/pylib/instrumentation/setup.py - Issue 1571803002: [Android] Prepare build/android/ for catapult+devil.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/instrumentation/setup.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/instrumentation/instrumentation_test_instance_test.py ('k') | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/setup.py

diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py

index b40137114e3eb621cd3ee11a3c56d0148c82304f..7a8f901b25ddde746580f317cf522c5a2ec5592f 100644

--- a/build/android/pylib/instrumentation/setup.py

+++ b/build/android/pylib/instrumentation/setup.py

@@ -8,9 +8,9 @@ import logging

import os

from devil.android import device_utils

-from pylib import constants

from pylib import valgrind_tools

from pylib.base import base_setup

+from pylib.constants import host_paths

from pylib.instrumentation import test_package

from pylib.instrumentation import test_runner

@@ -35,7 +35,7 @@ def _PushExtraSuiteDataDeps(device, test_apk):

'CronetTestInstrumentation']:

test_files = 'net/data/ssl/certificates'

host_device_file_tuple = [

- (os.path.join(constants.DIR_SOURCE_ROOT, test_files),

+ (os.path.join(host_paths.DIR_SOURCE_ROOT, test_files),

os.path.join(device.GetExternalStoragePath(), test_files))]

device.PushChangedFiles(host_device_file_tuple)

@@ -50,7 +50,7 @@ def _PushDataDeps(device, test_options):

dst_src = dest_host_pair.split(':', 1)

dst_layer = dst_src[0]

host_src = dst_src[1]

- host_test_files_path = os.path.join(constants.DIR_SOURCE_ROOT, host_src)

+ host_test_files_path = os.path.join(host_paths.DIR_SOURCE_ROOT, host_src)

if os.path.exists(host_test_files_path):

host_device_file_tuples += [(

host_test_files_path,