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

Unified Diff: content/content_common.gypi

Issue 195993010: Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use_mojo 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 9e0a8d61093ecc71498caf93f5aeaa03bd0183dd..06bd8edb30184a27087c17e4b8ba8b5a5865dedf 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -329,6 +329,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',
@@ -484,6 +487,27 @@
'content.gyp:webkit_version',
],
}],
+ # Work around for bug in linker used on ia32 machines (gold is not used on
+ # ia32 machines). See bug 353273.
+ ['use_mojo==1 and OS=="linux" and target_arch=="ia32" and component=="static_library"', {
+ 'link_settings': {
+ 'libraries': [
+ '<(PRODUCT_DIR)/lib/libmojo_system.so',
+ ],
+ },
+ }],
+ ['use_mojo==0', {
+ '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',
« 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