| Index: content/content_common.gypi
|
| diff --git a/content/content_common.gypi b/content/content_common.gypi
|
| index a97dc654ff84390835bc58d89f1330a5b0ef6268..1c3a3a6d95f95cdb24508de09c11cb0e253b07b0 100644
|
| --- a/content/content_common.gypi
|
| +++ b/content/content_common.gypi
|
| @@ -321,6 +321,9 @@
|
| 'common/message_router.cc',
|
| 'common/message_router.h',
|
| 'common/mime_registry_messages.h',
|
| + 'common/mojo/mojo_channel_init.cc',
|
| + 'common/mojo/mojo_channel_init.h',
|
| + 'common/mojo/mojo_messages.h',
|
| 'common/navigation_gesture.h',
|
| 'common/net/url_fetcher.cc',
|
| 'common/net/url_request_user_data.cc',
|
| @@ -476,6 +479,19 @@
|
| 'content.gyp:webkit_version',
|
| ],
|
| }],
|
| + # TODO(sky): conditional temporary until mojo is building on android and mac.
|
| + ['OS=="android" or OS=="mac"', {
|
| + 'sources!': [
|
| + 'common/mojo/mojo_channel_init.cc',
|
| + 'common/mojo/mojo_channel_init.h',
|
| + ],
|
| + }, {
|
| + 'dependencies': [
|
| + '../mojo/mojo.gyp:mojo_environment_chromium',
|
| + '../mojo/mojo.gyp:mojo_system',
|
| + '../mojo/mojo.gyp:mojo_system_impl',
|
| + ],
|
| + }],
|
| ['OS=="mac"', {
|
| 'sources': [
|
| 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
|
|
|