Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: content/content_browser.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, 5 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_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ea1de17c0f495ff795328aedb3fcdee4b6494c3c..cdbca7b44124db435e6b471a42e998e605f8e086 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1398,8 +1398,6 @@
'browser/compositor/gpu_process_transport_factory.h',
'browser/compositor/image_transport_factory.cc',
'browser/compositor/image_transport_factory.h',
- 'browser/compositor/no_transport_image_transport_factory.cc',
- 'browser/compositor/no_transport_image_transport_factory.h',
'browser/compositor/onscreen_display_client.cc',
'browser/compositor/onscreen_display_client.h',
'browser/compositor/overlay_candidate_validator_ozone.cc',
@@ -1599,7 +1597,13 @@
['OS!="android" and OS!="ios"', {
'dependencies': [
'browser/tracing/tracing_resources.gyp:tracing_resources',
+ '../ui/compositor/compositor.gyp:compositor',
],
+ 'sources': [ '<@(compositor_browser_sources)' ],
+ }, {
+ 'sources/': [
+ ['exclude', '^public/browser/context_factory.h'],
+ ]
}],
['OS!="ios"', {
'dependencies': [
@@ -1787,16 +1791,6 @@
['exclude', '^browser/renderer_host/ui_events_helper.h'],
],
}],
- ['use_aura==1 or OS=="mac"', {
- 'dependencies': [
- '../ui/compositor/compositor.gyp:compositor',
- ],
- 'sources': [ '<@(compositor_browser_sources)' ],
- }, {
- 'sources/': [
- ['exclude', '^public/browser/context_factory.h'],
- ]
- }],
['enable_plugins==1', {
'dependencies': [
'../ppapi/ppapi_internal.gyp:ppapi_ipc',

Powered by Google App Engine
This is Rietveld 408576698