testing/chromoting/integration_tests.gyp - Issue 723343002: Update from https://crrev.com/304121

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: testing/chromoting/integration_tests.gyp

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 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:

Index: testing/chromoting/integration_tests.gyp

diff --git a/testing/chromoting/integration_tests.gyp b/testing/chromoting/integration_tests.gyp

index 23fcf6ff9d69bdef72ef9b50a09cb9acfa5937ab..78c136888f0a81590ffedbceaa989e732f4610f8 100644

--- a/testing/chromoting/integration_tests.gyp

+++ b/testing/chromoting/integration_tests.gyp

@@ -20,6 +20,13 @@

'sources': [

'chromoting_integration_tests.isolate',

+ 'conditions': [

+ ['OS=="linux"', {

+ 'dependencies': [

+ '../../remoting/remoting.gyp:remoting_me2me_host_archive',

+ ],

+ }], # OS=="linux"

+ ],

}],

« no previous file with comments | « testing/chromoting/chromoting_integration_tests.isolate ('k') | testing/iossim/iossim.mm » ('j') | no next file with comments »