Index: url/url.gyp |
diff --git a/url/url.gyp b/url/url.gyp |
index cedd250f4ae85332f6bffe227a0d29ed849eafd1..4b7a4a0ee68138cca0b407a596b79db24f69d11a 100644 |
--- a/url/url.gyp |
+++ b/url/url.gyp |
@@ -134,22 +134,6 @@ |
'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
}, |
{ |
- 'target_name': 'url_interfaces_mojom_for_blink', |
- 'type': 'none', |
- 'variables': { |
- 'for_blink': 'true', |
- 'mojom_files': [ |
- 'mojo/origin.mojom', |
- 'mojo/url.mojom', |
- ], |
- 'mojom_typemaps': [ |
- '../third_party/WebKit/Source/platform/mojo/KURL.typemap', |
- '../third_party/WebKit/Source/platform/mojo/SecurityOrigin.typemap', |
- ], |
- }, |
- 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
- }, |
- { |
# GN version: //url/mojo:url_mojom_gurl and //url/mojo:url_mojom_origin |
'target_name': 'url_mojom', |
'type': 'static_library', |
@@ -163,19 +147,6 @@ |
], |
}, |
{ |
- # GN version: //url/mojo:url_mojom_gurl_blink and //url/mojo:url_mojom_origin_blink |
- 'target_name': 'url_mojom_for_blink', |
- 'type': 'static_library', |
- 'export_dependent_settings': [ |
- '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
- ], |
- 'dependencies': [ |
- '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
- 'url_interfaces_mojom_for_blink', |
- 'url_lib', |
- ], |
- }, |
- { |
# GN version: //url/mojo:test_url_mojom_gurl |
'target_name': 'url_test_interfaces_mojom', |
'type': 'none', |
@@ -194,25 +165,6 @@ |
], |
}, |
{ |
- # GN version: //url/mojo:test_url_mojom_gurl_blink |
- 'target_name': 'url_test_interfaces_mojom_for_blink', |
- 'type': 'none', |
- 'variables': { |
- 'for_blink': 'true', |
- 'mojom_files': [ |
- 'mojo/url_test.mojom', |
- ], |
- 'mojom_typemaps': [ |
- '../third_party/WebKit/Source/platform/mojo/KURL.typemap', |
- '../third_party/WebKit/Source/platform/mojo/SecurityOrigin.typemap', |
- ], |
- }, |
- 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
- 'dependencies': [ |
- '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
- ], |
- }, |
- { |
'target_name': 'url_test_mojom', |
'type': 'static_library', |
'export_dependent_settings': [ |
@@ -264,6 +216,58 @@ |
}, |
], |
}], |
+ ['OS!="ios"', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'url_interfaces_mojom_for_blink', |
+ 'type': 'none', |
+ 'variables': { |
+ 'for_blink': 'true', |
+ 'mojom_files': [ |
+ 'mojo/origin.mojom', |
+ 'mojo/url.mojom', |
+ ], |
+ 'mojom_typemaps': [ |
+ '../third_party/WebKit/Source/platform/mojo/KURL.typemap', |
+ '../third_party/WebKit/Source/platform/mojo/SecurityOrigin.typemap', |
+ ], |
+ }, |
+ 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
+ }, |
+ { |
+ # GN version: //url/mojo:url_mojom_gurl_blink and //url/mojo:url_mojom_origin_blink |
+ 'target_name': 'url_mojom_for_blink', |
+ 'type': 'static_library', |
+ 'export_dependent_settings': [ |
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
+ ], |
+ 'dependencies': [ |
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
+ 'url_interfaces_mojom_for_blink', |
+ 'url_lib', |
+ ], |
+ }, |
+ { |
+ # GN version: //url/mojo:test_url_mojom_gurl_blink |
+ 'target_name': 'url_test_interfaces_mojom_for_blink', |
+ 'type': 'none', |
+ 'variables': { |
+ 'for_blink': 'true', |
+ 'mojom_files': [ |
+ 'mojo/url_test.mojom', |
+ ], |
+ 'mojom_typemaps': [ |
+ '../third_party/WebKit/Source/platform/mojo/KURL.typemap', |
+ '../third_party/WebKit/Source/platform/mojo/SecurityOrigin.typemap', |
+ ], |
+ }, |
+ 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
+ 'dependencies': [ |
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
+ ], |
+ }, |
+ ], |
+ }], |
['test_isolation_mode != "noop"', { |
'targets': [ |
{ |