projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ipc
/
mojo
/
ipc_mojo.gyp
diff --git
a/src/ipc/mojo/ipc_mojo.gyp
b/src/ipc/mojo/ipc_mojo.gyp
index
e4bdd20
..
a9a2673
100644
(file)
--- a/
src/ipc/mojo/ipc_mojo.gyp
+++ b/
src/ipc/mojo/ipc_mojo.gyp
@@
-17,15
+17,17
@@
'defines': [
'IPC_MOJO_IMPLEMENTATION',
],
'defines': [
'IPC_MOJO_IMPLEMENTATION',
],
+ 'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
'dependencies': [
'../ipc.gyp:ipc',
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'dependencies': [
'../ipc.gyp:ipc',
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../../mojo/
mojo_base.gyp:mojo_cpp_bindings
',
+ '../../mojo/
edk/mojo_edk.gyp:mojo_system_impl
',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../mojo/
mojo_base.gyp:mojo_system_impl
',
+ '../../mojo/
public/mojo_public.gyp:mojo_cpp_bindings
',
],
'sources': [
],
'sources': [
+ 'client_channel.mojom',
'ipc_channel_mojo.cc',
'ipc_channel_mojo.h',
'ipc_channel_mojo_host.cc',
'ipc_channel_mojo.cc',
'ipc_channel_mojo.h',
'ipc_channel_mojo_host.cc',
@@
-54,9
+56,9
@@
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:test_support_base',
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:test_support_base',
- '../../mojo/
mojo_base.gyp:mojo_cpp_bindings
',
+ '../../mojo/
edk/mojo_edk.gyp:mojo_system_impl
',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../mojo/
mojo_base.gyp:mojo_system_impl
',
+ '../../mojo/
public/mojo_public.gyp:mojo_cpp_bindings
',
'../../testing/gtest.gyp:gtest',
'ipc_mojo',
],
'../../testing/gtest.gyp:gtest',
'ipc_mojo',
],
@@
-81,9
+83,9
@@
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:test_support_base',
'../../base/base.gyp:test_support_perf',
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:test_support_base',
'../../base/base.gyp:test_support_perf',
- '../../mojo/
mojo_base.gyp:mojo_cpp_bindings
',
+ '../../mojo/
edk/mojo_edk.gyp:mojo_system_impl
',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../mojo/
mojo_base.gyp:mojo_system_impl
',
+ '../../mojo/
public/mojo_public.gyp:mojo_cpp_bindings
',
'../../testing/gtest.gyp:gtest',
'ipc_mojo',
],
'../../testing/gtest.gyp:gtest',
'ipc_mojo',
],