content/content_tests.gypi - Issue 1173363008: [Android] Refactor browser test execution. (RELAND)

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: content/content_tests.gypi

Issue 1173363008: [Android] Refactor browser test execution. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed. Created 5 years, 6 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 | « components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java ('k') | content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index b97cff07b1658fa09d16896545af7fb292291529..bdd665a008f50185bce45c4bee675dfadc6816c1 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -1814,6 +1814,21 @@

'includes': [ '../build/apk_test.gypi' ],

{

+ 'target_name': 'content_shell_browsertests_java',

+ 'type': 'none',

+ 'dependencies': [

+ 'content.gyp:content_java',

+ 'content_shell_java',

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

+ '../testing/android/native_test.gyp:native_test_java',

+ '../ui/android/ui_android.gyp:ui_java',

+ ],

+ 'variables': {

+ 'java_in_dir': 'shell/android/browsertests',

+ },

+ 'includes': [ '../build/java.gypi' ],

+ },

+ {

# TODO(GN)

'target_name': 'content_browsertests_manifest',

'type': 'none',

@@ -1832,6 +1847,7 @@

'content.gyp:content_java',

'content.gyp:content_v8_external_data',

'content_browsertests',

+ 'content_shell_browsertests_java',

'content_java_test_support',

'content_shell_java',