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

Unified Diff: trunk/src/content/content_common.gypi

Issue 202683004: Revert 257505 "Adds the ability for the renderer to create the m..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/content_browser.gypi ('k') | trunk/src/content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/content_common.gypi
===================================================================
--- trunk/src/content/content_common.gypi (revision 257564)
+++ trunk/src/content/content_common.gypi (working copy)
@@ -329,9 +329,6 @@
'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',
@@ -487,28 +484,6 @@
'content.gyp:webkit_version',
],
}],
- # Work around for bug in linker used on ia32 machines (gold is not used on
- # ia32 machines). See bug 353273.
- ['OS=="linux" and target_arch=="ia32" and component=="static_library"', {
- 'link_settings': {
- 'libraries': [
- '<(PRODUCT_DIR)/lib/libmojo_system.so',
- ],
- },
- }],
- # TODO(sky): conditional temporary until mojo is sorted out on mac.
- ['OS=="mac" or OS=="ios"', {
- '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 | « trunk/src/content/content_browser.gypi ('k') | trunk/src/content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698