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

Side by Side Diff: content/content_common.gypi

Issue 201283002: Revert of Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'common/media/media_stream_track_metrics_host_messages.h', 317 'common/media/media_stream_track_metrics_host_messages.h',
318 'common/media/midi_messages.h', 318 'common/media/midi_messages.h',
319 'common/media/video_capture.h', 319 'common/media/video_capture.h',
320 'common/media/video_capture_messages.h', 320 'common/media/video_capture_messages.h',
321 'common/media/webrtc_identity_messages.h', 321 'common/media/webrtc_identity_messages.h',
322 'common/memory_benchmark_messages.h', 322 'common/memory_benchmark_messages.h',
323 'common/message_port_messages.h', 323 'common/message_port_messages.h',
324 'common/message_router.cc', 324 'common/message_router.cc',
325 'common/message_router.h', 325 'common/message_router.h',
326 'common/mime_registry_messages.h', 326 'common/mime_registry_messages.h',
327 'common/mojo/mojo_channel_init.cc',
328 'common/mojo/mojo_channel_init.h',
329 'common/mojo/mojo_messages.h',
330 'common/navigation_gesture.h', 327 'common/navigation_gesture.h',
331 'common/net/url_fetcher.cc', 328 'common/net/url_fetcher.cc',
332 'common/net/url_request_user_data.cc', 329 'common/net/url_request_user_data.cc',
333 'common/net/url_request_user_data.h', 330 'common/net/url_request_user_data.h',
334 'common/one_writer_seqlock.cc', 331 'common/one_writer_seqlock.cc',
335 'common/one_writer_seqlock.h', 332 'common/one_writer_seqlock.h',
336 'common/p2p_messages.h', 333 'common/p2p_messages.h',
337 'common/page_state_serialization.cc', 334 'common/page_state_serialization.cc',
338 'common/page_state_serialization.h', 335 'common/page_state_serialization.h',
339 'common/page_zoom.cc', 336 'common/page_zoom.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 '../media/media.gyp:shared_memory_support', 472 '../media/media.gyp:shared_memory_support',
476 '../third_party/WebKit/public/blink.gyp:blink', 473 '../third_party/WebKit/public/blink.gyp:blink',
477 '../ui/gl/gl.gyp:gl', 474 '../ui/gl/gl.gyp:gl',
478 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 475 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
479 '../webkit/common/webkit_common.gyp:webkit_common', 476 '../webkit/common/webkit_common.gyp:webkit_common',
480 '../webkit/storage_browser.gyp:webkit_storage_browser', 477 '../webkit/storage_browser.gyp:webkit_storage_browser',
481 '../webkit/storage_common.gyp:webkit_storage_common', 478 '../webkit/storage_common.gyp:webkit_storage_common',
482 'content.gyp:webkit_version', 479 'content.gyp:webkit_version',
483 ], 480 ],
484 }], 481 }],
485 # TODO(sky): conditional temporary until mojo is sorted out on mac.
486 ['OS=="mac" or OS=="ios"', {
487 'sources!': [
488 'common/mojo/mojo_channel_init.cc',
489 'common/mojo/mojo_channel_init.h',
490 ],
491 }, {
492 'dependencies': [
493 '../mojo/mojo.gyp:mojo_environment_chromium',
494 '../mojo/mojo.gyp:mojo_system',
495 '../mojo/mojo.gyp:mojo_system_impl',
496 ],
497 }],
498 ['OS=="mac"', { 482 ['OS=="mac"', {
499 'sources': [ 483 'sources': [
500 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc', 484 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
501 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h', 485 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
502 ], 486 ],
503 'sources!': [ 487 'sources!': [
504 'common/plugin_list_posix.cc', 488 'common/plugin_list_posix.cc',
505 ], 489 ],
506 'link_settings': { 490 'link_settings': {
507 'libraries': [ 491 'libraries': [
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 705 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
722 'common/sandbox_linux/bpf_renderer_policy_linux.h', 706 'common/sandbox_linux/bpf_renderer_policy_linux.h',
723 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 707 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
724 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 708 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
725 ], 709 ],
726 }, { 710 }, {
727 'defines': ['USE_SECCOMP_BPF'], 711 'defines': ['USE_SECCOMP_BPF'],
728 }], 712 }],
729 ], 713 ],
730 } 714 }
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