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

Side by Side Diff: content/content_common.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 'dependencies': [ 493 'dependencies': [
494 '../cc/cc.gyp:cc', 494 '../cc/cc.gyp:cc',
495 '../gpu/gpu.gyp:command_buffer_service', 495 '../gpu/gpu.gyp:command_buffer_service',
496 '../gpu/gpu.gyp:gles2_c_lib', 496 '../gpu/gpu.gyp:gles2_c_lib',
497 '../gpu/gpu.gyp:gles2_implementation', 497 '../gpu/gpu.gyp:gles2_implementation',
498 '../gpu/gpu.gyp:gpu_ipc', 498 '../gpu/gpu.gyp:gpu_ipc',
499 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', 499 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
500 '../ipc/ipc.gyp:ipc', 500 '../ipc/ipc.gyp:ipc',
501 '../media/media.gyp:media', 501 '../media/media.gyp:media',
502 '../media/media.gyp:shared_memory_support', 502 '../media/media.gyp:shared_memory_support',
503 '../mojo/mojo.gyp:mojo_environment_chromium',
504 '../mojo/mojo.gyp:mojo_system',
505 '../mojo/mojo.gyp:mojo_system_impl',
503 '../third_party/WebKit/public/blink.gyp:blink', 506 '../third_party/WebKit/public/blink.gyp:blink',
504 '../ui/gl/gl.gyp:gl', 507 '../ui/gl/gl.gyp:gl',
505 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 508 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
506 '../webkit/common/webkit_common.gyp:webkit_common', 509 '../webkit/common/webkit_common.gyp:webkit_common',
507 '../webkit/storage_browser.gyp:webkit_storage_browser', 510 '../webkit/storage_browser.gyp:webkit_storage_browser',
508 '../webkit/storage_common.gyp:webkit_storage_common', 511 '../webkit/storage_common.gyp:webkit_storage_common',
509 'content.gyp:webkit_version', 512 'content.gyp:webkit_version',
510 ], 513 ],
511 }], 514 }],
512 ['use_mojo==0', {
513 'sources!': [
514 'common/mojo/mojo_channel_init.cc',
515 'common/mojo/mojo_channel_init.h',
516 ],
517 }, {
518 'dependencies': [
519 '../mojo/mojo.gyp:mojo_environment_chromium',
520 '../mojo/mojo.gyp:mojo_system',
521 '../mojo/mojo.gyp:mojo_system_impl',
522 ],
523 }],
524 ['OS=="mac"', { 515 ['OS=="mac"', {
525 'dependencies': [ 516 'dependencies': [
526 '../webkit/webkit_resources.gyp:webkit_resources', 517 '../webkit/webkit_resources.gyp:webkit_resources',
527 ], 518 ],
528 'sources': [ 519 'sources': [
529 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc', 520 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
530 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h', 521 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
531 ], 522 ],
532 'sources!': [ 523 'sources!': [
533 'common/plugin_list_posix.cc', 524 'common/plugin_list_posix.cc',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 747 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
757 'common/sandbox_linux/bpf_renderer_policy_linux.h', 748 'common/sandbox_linux/bpf_renderer_policy_linux.h',
758 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 749 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
759 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 750 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
760 ], 751 ],
761 }, { 752 }, {
762 'defines': ['USE_SECCOMP_BPF'], 753 'defines': ['USE_SECCOMP_BPF'],
763 }], 754 }],
764 ], 755 ],
765 } 756 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698