chrome/chrome_tests.gypi - Issue 1218053003: [Android] Begin switching from lighttpd + apache to 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: chrome/chrome_tests.gypi

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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 | « chrome/browser/android/chrome_test_entry_point.cc ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 4dcb05627de16eabf71a956dcadd20809be23010..f06aa792f90ccc155cfd42db1462eb3429535140 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -3008,6 +3008,7 @@

'chrome_java',

'chrome_shell_apk_java',

'chrome_java_test_support',

+ 'libchrome_java_test_support',

'../base/base.gyp:base',

'../base/base.gyp:base_java_test_support',

'../content/content_shell_and_tests.gyp:content_java_test_support',

@@ -3018,6 +3019,7 @@

'apk_name': 'ChromeShellTest',

'java_in_dir': 'android/shell/javatests',

'additional_src_dirs': ['android/javatests_shell/src'],

+ 'native_lib_target': 'libchrome_java_test_support',

'is_test_apk': 1,

'test_type': 'instrumentation',

'isolate_file': 'chrome_shell_test_apk.isolate',

@@ -3089,6 +3091,7 @@

'chrome_java',

'chrome_sync_shell_apk_java',

'chrome_java_test_support',

+ 'libchrome_java_test_support',

'../base/base.gyp:base',

'../base/base.gyp:base_java_test_support',

'../content/content_shell_and_tests.gyp:content_java_test_support',

@@ -3098,6 +3101,7 @@

'apk_name': 'ChromeSyncShellTest',

'java_in_dir': 'android/sync_shell/javatests',

'additional_src_dirs': [ 'android/shell/javatests', ],

+ 'native_lib_target': 'libchrome_java_test_support',

'is_test_apk': 1,

'test_type': 'instrumentation',

@@ -3107,6 +3111,17 @@

{

+ 'target_name': 'libchrome_java_test_support',

+ 'type': 'shared_library',

+ 'dependencies': [

+ '../base/base.gyp:base',

+ '../net/net.gyp:net_test_support',

+ ],

+ 'sources': [

+ 'browser/android/chrome_test_entry_point.cc',

+ ],

+ },

+ {

# GN: //chrome/test/android:chrome_java_test_support

'target_name': 'chrome_java_test_support',

'type': 'none',