chrome/chrome_tests.gypi - Issue 1120883002: [Android] Generate scripts at build time to run android tests.

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 1120883002: [Android] Generate scripts at build time to run android tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed jbudorick's comments. Created 5 years, 7 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

Index: chrome/chrome_tests.gypi

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

index 73e039daa337c1bbf7fb8ec11625d5427755d2f1..d4ab11c81bb01a9c307e518fc669207f37205346 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -2967,8 +2967,13 @@

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

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

'is_test_apk': 1,

+ 'test_type': 'instrumentation',

+ 'isolate_file': 'chrome_shell_test_apk.isolate',

- 'includes': [ '../build/java_apk.gypi' ],

+ 'includes': [

+ '../build/java_apk.gypi',

+ '../build/android/test_runner.gypi',

+ ],

{

# GN: //chrome/android:chrome_junit_tests

@@ -3041,8 +3046,12 @@

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

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