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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'layouttest_support_content', 8 'target_name': 'layouttest_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 '../build/linux/system.gyp:glib', 312 '../build/linux/system.gyp:glib',
313 ], 313 ],
314 }], 314 }],
315 ['use_aura==1', { 315 ['use_aura==1', {
316 'dependencies': [ 316 'dependencies': [
317 '../ui/aura/aura.gyp:aura_test_support', 317 '../ui/aura/aura.gyp:aura_test_support',
318 '../ui/resources/ui_resources.gyp:ui_test_pak', 318 '../ui/resources/ui_resources.gyp:ui_test_pak',
319 '../ui/wm/wm.gyp:wm', 319 '../ui/wm/wm.gyp:wm',
320 ], 320 ],
321 }], 321 }],
322 ['use_aura==1 or OS=="mac"', {
323 'dependencies': [
324 '../ui/compositor/compositor.gyp:compositor',
325 ],
326 }],
327 ['OS=="win"', { 322 ['OS=="win"', {
328 'dependencies': [ 323 'dependencies': [
329 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 324 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
330 ], 325 ],
331 }], 326 }],
332 ['OS!="android" and OS!="ios"', { 327 ['OS!="android" and OS!="ios"', {
328 'sources': [
329 '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
330 'browser/compositor/no_transport_image_transport_factory.h',
331 ],
333 'dependencies': [ 332 'dependencies': [
333 '../ui/compositor/compositor.gyp:compositor',
334 '../third_party/libvpx/libvpx.gyp:libvpx', 334 '../third_party/libvpx/libvpx.gyp:libvpx',
335 ], 335 ],
336 }], 336 }],
337 ['OS=="android"', { 337 ['OS=="android"', {
338 'dependencies': [ 338 'dependencies': [
339 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 339 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
340 ], 340 ],
341 }], 341 }],
342 ], 342 ],
343 }, 343 },
(...skipping 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1836 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1836 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1837 }, 1837 },
1838 ], 1838 ],
1839 }], 1839 }],
1840 ], 1840 ],
1841 }, 1841 },
1842 ], 1842 ],
1843 }], 1843 }],
1844 ], 1844 ],
1845 } 1845 }
OLDNEW
« content/browser/compositor/image_transport_factory.h ('K') | « content/content_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698