OLD | NEW |
---|---|
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 }, | 8 }, |
9 'includes': [ | 9 'includes': [ |
10 'url_srcs.gypi', | 10 'url_srcs.gypi', |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 }, | 133 }, |
134 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], | 134 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], |
135 }, | 135 }, |
136 { | 136 { |
137 # GN version: //url/mojo:url_mojom_gurl and //url/mojo:url_mojom_origin | 137 # GN version: //url/mojo:url_mojom_gurl and //url/mojo:url_mojom_origin |
138 'target_name': 'url_mojom', | 138 'target_name': 'url_mojom', |
139 'type': 'static_library', | 139 'type': 'static_library', |
140 'export_dependent_settings': [ | 140 'export_dependent_settings': [ |
141 '../mojo/mojo_public.gyp:mojo_cpp_bindings', | 141 '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
142 ], | 142 ], |
143 # url_interfaces_mojom generates headers and is a hard dependency. | |
144 # It seems that this hard dependency status is not propagated to | |
brettw
2016/07/15 17:03:40
Just remove "it seems" because GYP does indeed not
Mostyn Bramley-Moore
2016/07/15 17:29:43
Done.
| |
145 # this target, so we must set it explicitly. | |
146 'hard_dependency': 1, | |
143 'dependencies': [ | 147 'dependencies': [ |
144 '../mojo/mojo_public.gyp:mojo_cpp_bindings', | 148 '../mojo/mojo_public.gyp:mojo_cpp_bindings', |
145 'url_interfaces_mojom', | 149 'url_interfaces_mojom', |
146 'url_lib', | 150 'url_lib', |
147 ], | 151 ], |
148 }, | 152 }, |
149 { | 153 { |
150 # GN version: //url/mojo:test_url_mojom_gurl | 154 # GN version: //url/mojo:test_url_mojom_gurl |
151 'target_name': 'url_test_interfaces_mojom', | 155 'target_name': 'url_test_interfaces_mojom', |
152 'type': 'none', | 156 'type': 'none', |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
280 '../build/isolate.gypi', | 284 '../build/isolate.gypi', |
281 ], | 285 ], |
282 'sources': [ | 286 'sources': [ |
283 'url_unittests.isolate', | 287 'url_unittests.isolate', |
284 ], | 288 ], |
285 }, | 289 }, |
286 ], | 290 ], |
287 }], | 291 }], |
288 ], | 292 ], |
289 } | 293 } |
OLD | NEW |