summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 03:36:09 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 03:36:09 +0000
commit6c2e80be1c3f233a737dcc121961513168c9a032 (patch)
tree2d9e7a9ee3604fae7ccf003f465a0ae680f2bfba /mojo/mojo.gyp
parent9a97f49dc7b6caf9d95503855f2a4ea5b7bee04e (diff)
downloadchromium_src-6c2e80be1c3f233a737dcc121961513168c9a032.zip
chromium_src-6c2e80be1c3f233a737dcc121961513168c9a032.tar.gz
chromium_src-6c2e80be1c3f233a737dcc121961513168c9a032.tar.bz2
Revert 234975 "Work in progress for end-to-end bindings"
This apparently broke the win and mac debug trybots. > Work in progress for end-to-end bindings > > R=darin@chromium.org > > Review URL: https://codereview.chromium.org/72123002 TBR=davemoore@chromium.org Review URL: https://codereview.chromium.org/62103015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp36
1 files changed, 0 insertions, 36 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 3e05b33..e7cc056 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -233,7 +233,6 @@
'mojo_system',
'mojo_utility',
'native_viewport',
- 'hello_world_service_impl',
],
'sources': [
'shell/app_container.cc',
@@ -316,50 +315,15 @@
'type': 'shared_library',
'dependencies': [
'../ui/gl/gl.gyp:gl',
- 'hello_world_service',
- 'mojo_common_lib',
'mojo_system',
],
'sources': [
- 'examples/sample_app/hello_world_client_impl.cc',
- 'examples/sample_app/hello_world_client_impl.h',
'examples/sample_app/sample_app.cc',
'examples/sample_app/spinning_cube.cc',
'examples/sample_app/spinning_cube.h',
],
},
{
- 'target_name': 'hello_world_service',
- 'type': 'static_library',
- 'dependencies': [
- 'mojo_bindings',
- 'mojo_system',
- ],
- 'export_dependent_settings': [
- 'mojo_bindings',
- 'mojo_system',
- ],
- 'sources': [
- 'examples/hello_world_service/hello_world_service.mojom',
- ],
- 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
- },
- {
- 'target_name': 'hello_world_service_impl',
- 'type': 'static_library',
- 'sources': [
- 'examples/hello_world_service/hello_world_service_impl.cc',
- 'examples/hello_world_service/hello_world_service_impl.h',
- ],
- 'export_dependent_settings': [
- 'hello_world_service',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- 'hello_world_service',
- ],
- },
- {
'target_name': 'mojo_bindings',
'type': 'static_library',
'include_dirs': [