summaryrefslogtreecommitdiffstats
path: root/content/content_common_mojo_bindings.gypi
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-14 20:51:14 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-14 20:51:14 +0000
commit0fb4abfcaea7a139f2429b09aa5fcb114a65d33a (patch)
tree4bc749493217cc399356e4e5855082572033afdc /content/content_common_mojo_bindings.gypi
parent539c1022ad2837b2171d510252afa575f89d9dcb (diff)
downloadchromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.zip
chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.gz
chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.bz2
Revert 263717 "Make mojo_system static and mojo_system_impl a co..."
Reason for revert: broke Win x64 Builder: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder/builds/17235/ > Make mojo_system static and mojo_system_impl a component, never use both > > BUG= > R=viettrungluu@chromium.org > > Review URL: https://codereview.chromium.org/231353002 TBR=davemoore@chromium.org Review URL: https://codereview.chromium.org/237703002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common_mojo_bindings.gypi')
-rw-r--r--content/content_common_mojo_bindings.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_common_mojo_bindings.gypi b/content/content_common_mojo_bindings.gypi
index 71d9225..af9ea88 100644
--- a/content/content_common_mojo_bindings.gypi
+++ b/content/content_common_mojo_bindings.gypi
@@ -10,6 +10,7 @@
'dependencies': [
'../mojo/mojo.gyp:mojo_bindings',
'../mojo/mojo.gyp:mojo_environment_chromium',
+ '../mojo/mojo.gyp:mojo_system',
],
'sources': [
'common/mojo/render_process.mojom',
@@ -23,6 +24,7 @@
'export_dependent_settings': [
'../mojo/mojo.gyp:mojo_bindings',
'../mojo/mojo.gyp:mojo_environment_chromium',
+ '../mojo/mojo.gyp:mojo_system',
],
},
],