content/content_tests.gypi - Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets.

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 369923003: NoTransportImageTransportFactory is compiled into only test targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix mac build. merge same condition in gyp. Created 6 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

Index: content/content_tests.gypi

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

index 17d78c370b1ddf340a1d0b38e8d5a8153e90c324..112b9f34d7e519cf5a61875a2051e8a1b59753b2 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -319,18 +319,18 @@

'../ui/wm/wm.gyp:wm',

}],

- ['use_aura==1 or OS=="mac"', {

- 'dependencies': [

- '../ui/compositor/compositor.gyp:compositor',

- ],

- }],

['OS=="win"', {

'dependencies': [

'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',

}],

['OS!="android" and OS!="ios"', {

+ 'sources': [

+ 'browser/compositor/no_transport_image_transport_factory.cc',

danakj 2014/07/07 16:52:27 can you move these 2 files to browser/compositor/t

+ 'browser/compositor/no_transport_image_transport_factory.h',

+ ],

'dependencies': [

+ '../ui/compositor/compositor.gyp:compositor',

'../third_party/libvpx/libvpx.gyp:libvpx',

}],

« content/browser/compositor/image_transport_factory.h ('K') | « content/content_browser.gypi ('k') | no next file » | no next file with comments »