chrome/chrome_tests.gypi - Issue 18873009: Revert "Revert "Remove dependencies on /media for iOS.""

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 18873009: Revert "Revert "Remove dependencies on /media for iOS."" (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Re-upload patch Created 7 years, 4 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:

Index: chrome/chrome_tests.gypi

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

index 88abe822afa513082099fb53e178b7ff94b24e25..73def3e14442ae64894a08c1da157cb0d1f02478 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -3166,7 +3166,6 @@

# Disabling for now (enabled on linux/windows below).

# 'browser_tests',

'../ipc/ipc.gyp:ipc_tests',

- '../media/media.gyp:media_unittests',

'../net/net.gyp:net_unittests',

'../printing/printing.gyp:printing_unittests',

'../remoting/remoting.gyp:remoting_unittests',

@@ -3176,6 +3175,10 @@

'../sync/sync.gyp:sync_unit_tests',

], # 'dependencies'

'conditions': [

+ ['OS!="ios"', {

+ 'dependencies': [

+ '../media/media.gyp:media_unittests',

+ ]}],

['OS=="win"', {

'dependencies': [

# Courgette has not been ported from Windows.

« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »