build/android/pylib/remote/device/remote_device_instrumentation_test_run.py - Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

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/remote/device/remote_device_instrumentation_test_run.py

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: aidl cleaning Created 5 years, 1 month 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/local/device/local_device_instrumentation_test_run.py ('k') | build/config/android/rules.gni » ('j') | build/config/android/rules.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

diff --git a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

index 8858b069ce6fdd4bed80cdbef419f7a7e3f32e06..ee0185794d143a3dade7bcb7d1f690d6aa2bd14a 100644

--- a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

+++ b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

@@ -40,7 +40,6 @@ class RemoteDeviceInstrumentationTestRun(

env_vars = self._test_instance.GetDriverEnvironmentVars(

test_list_file_path=test_list_file.name)

- env_vars.update(self._test_instance.GetHttpServerEnvironmentVars())

logging.debug('extras:')

for k, v in env_vars.iteritems():