| Index: third_party/WebKit/public/blink.gyp
|
| diff --git a/third_party/WebKit/public/blink.gyp b/third_party/WebKit/public/blink.gyp
|
| index e7522352a2668346bc54d51160a547783d1a6a13..0df98e4740e54e931cf0ca7647456760dbd181cc 100644
|
| --- a/third_party/WebKit/public/blink.gyp
|
| +++ b/third_party/WebKit/public/blink.gyp
|
| @@ -55,7 +55,7 @@
|
| 'target_name': 'blink',
|
| 'type': 'none',
|
| 'dependencies': [
|
| - 'mojo_bindings',
|
| + 'mojo_bindings_blink',
|
| '../Source/platform/blink_platform.gyp:blink_platform',
|
| '../Source/web/web.gyp:blink_web',
|
| '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
|
| @@ -125,21 +125,46 @@
|
| 'mojom_files': [
|
| '<@(blink_mojo_sources)',
|
| '<@(blink_android_mojo_sources)',
|
| + 'platform/modules/manifest/manifest.mojom',
|
| + 'platform/modules/manifest/manifest_manager.mojom',
|
| + ],
|
| + 'mojom_typemaps': [
|
| + '<(DEPTH)/content/public/common/manifest.typemap',
|
| + '<(DEPTH)/ui/gfx/geometry/mojo/geometry.typemap',
|
| + '<(DEPTH)/url/mojo/gurl.typemap',
|
| ],
|
| },
|
| 'includes': [
|
| '../../../mojo/mojom_bindings_generator_explicit.gypi',
|
| ],
|
| + 'dependencies': [
|
| + '<(DEPTH)/url/url.gyp:url_interfaces_mojom',
|
| + ]
|
| },
|
| {
|
| # GN version: //third_party/WebKit/public:mojo_bindings
|
| - 'target_name': 'mojo_bindings',
|
| + 'target_name': 'mojo_bindings_blink',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| 'mojo_bindings_blink_mojom',
|
| + '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| + ],
|
| + },
|
| + {
|
| + # GN version: //third_party/WebKit/public:mojo_bindings
|
| + 'target_name': 'mojo_bindings',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| 'mojo_bindings_mojom',
|
| '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| + '<(DEPTH)/ui/gfx/gfx.gyp:mojo_geometry_bindings',
|
| + '<(DEPTH)/url/url.gyp:url_mojom',
|
| + '<(DEPTH)/url/url.gyp:url_lib',
|
| ],
|
| + 'sources': [
|
| + '<(DEPTH)/content/public/common/manifest_struct_traits.cc',
|
| + '<(DEPTH)/content/public/common/manifest_struct_traits.h',
|
| + ]
|
| },
|
| ],
|
| 'conditions': [
|
|
|