diff options
| author | jam <jam@chromium.org> | 2016-03-03 15:11:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 23:13:21 +0000 |
| commit | baaeb815d807659fc7fe9b8cba2cc3b4d20018bf (patch) | |
| tree | 5763d074a5369c6c4d2d25dc935fb07bacdc5fc3 /url/url.gyp | |
| parent | fd4a7725b4762877ef29c50bf2e0095e8d26fe39 (diff) | |
| download | chromium_src-baaeb815d807659fc7fe9b8cba2cc3b4d20018bf.zip chromium_src-baaeb815d807659fc7fe9b8cba2cc3b4d20018bf.tar.gz chromium_src-baaeb815d807659fc7fe9b8cba2cc3b4d20018bf.tar.bz2 | |
Add mojo struct traits for GURL so that it can be sent over mojoms.
The motivation for adding a structtraits for GURL, as opposed to using paramtraits, is that most probably we'll be passing urls to languages other than C++.
BUG=586194
Review URL: https://codereview.chromium.org/1760643004
Cr-Commit-Position: refs/heads/master@{#379128}
Diffstat (limited to 'url/url.gyp')
| -rw-r--r-- | url/url.gyp | 73 |
1 files changed, 72 insertions, 1 deletions
diff --git a/url/url.gyp b/url/url.gyp index e9e7ff5..e7fb3aa 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -40,14 +40,18 @@ 'target_name': 'url_unittests', 'type': 'executable', 'dependencies': [ - '../base/base.gyp:run_all_unittests', + '../base/base.gyp:test_support_base', + '../mojo/mojo_edk.gyp:mojo_common_test_support', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icuuc', + 'url_test_mojom', 'url_lib', ], 'sources': [ 'gurl_unittest.cc', + 'mojo/url_gurl_struct_traits_unittest.cc', 'origin_unittest.cc', + 'run_all_unittests.cc', 'scheme_host_port_unittest.cc', 'url_canon_icu_unittest.cc', 'url_canon_unittest.cc', @@ -58,6 +62,73 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, + { + 'target_name': 'url_interfaces_mojom', + 'type': 'none', + 'variables': { + 'mojom_files': [ + 'mojo/url.mojom', + ], + }, + 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], + }, + { + 'target_name': 'url_mojom_chromium', + 'type': 'none', + 'variables': { + 'mojom_variant': 'chromium', + 'mojom_extra_generator_args': [ + '--typemap', '<(DEPTH)/url/mojo/gurl.typemap', + ], + 'mojom_files': [ + 'mojo/url.mojom', + ], + }, + 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], + 'dependencies': [ + 'url_interfaces_mojom', + ], + }, + { + 'target_name': 'url_mojom', + 'type': 'static_library', + 'export_dependent_settings': [ + '../mojo/mojo_public.gyp:mojo_cpp_bindings', + ], + 'dependencies': [ + '../mojo/mojo_public.gyp:mojo_cpp_bindings', + 'url_interfaces_mojom', + ], + }, + { + 'target_name': 'url_test_interfaces_mojom', + 'type': 'none', + 'variables': { + 'mojom_extra_generator_args': [ + '--typemap', '<(DEPTH)/url/mojo/gurl.typemap', + ], + 'mojom_files': [ + 'mojo/url_test.mojom', + ], + }, + 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], + 'dependencies': [ + '../mojo/mojo_public.gyp:mojo_cpp_bindings', + 'url_mojom_chromium', + ], + }, + { + 'target_name': 'url_test_mojom', + 'type': 'static_library', + 'export_dependent_settings': [ + '../mojo/mojo_public.gyp:mojo_cpp_bindings', + ], + 'dependencies': [ + '../mojo/mojo_public.gyp:mojo_cpp_bindings', + 'url_mojom', + 'url_test_interfaces_mojom', + ], + }, ], 'conditions': [ ['OS=="android"', { |