diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:37:35 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:38:29 +0000 |
| commit | 149e96802366c208c13ff608339a4498e51a78a7 (patch) | |
| tree | b74bed186a0dcd04f38ec0a313042bc8a72904a8 /mojo | |
| parent | b1867c911e8525d5c203299b04a7756733f6f88e (diff) | |
| download | chromium_src-149e96802366c208c13ff608339a4498e51a78a7.zip chromium_src-149e96802366c208c13ff608339a4498e51a78a7.tar.gz chromium_src-149e96802366c208c13ff608339a4498e51a78a7.tar.bz2 | |
Mojo: Only link against one system impl
In the static build mojo_surfaces_service and some examples were linking
against both mojo_system and mojo_system_impl, which doesn't work.
R=erg@chromium.org
Review URL: https://codereview.chromium.org/468563002
Cr-Commit-Position: refs/heads/master@{#289134}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_examples.gypi | 2 | ||||
| -rw-r--r-- | mojo/mojo_services.gypi | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index d382073..4058ac8 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -372,7 +372,6 @@ 'mojo_base.gyp:mojo_application_chromium', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_system_impl', 'mojo_geometry_bindings', 'mojo_geometry_lib', 'mojo_native_viewport_bindings', @@ -426,7 +425,6 @@ 'mojo_base.gyp:mojo_application_chromium', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_system_impl', 'mojo_geometry_bindings', 'mojo_geometry_lib', 'mojo_surfaces_app_bindings', diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi index 2203e08..0715bf4f 100644 --- a/mojo/mojo_services.gypi +++ b/mojo/mojo_services.gypi @@ -391,7 +391,6 @@ '../cc/cc.gyp:cc_surfaces', '../ui/gfx/gfx.gyp:gfx_geometry', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_system_impl', 'mojo_base.gyp:mojo_application_chromium', 'mojo_cc_support', 'mojo_geometry_bindings', |