Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: url/url.gyp

Issue 1760643004: Add mojo struct traits for GURL so that it can be sent over mojoms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« url/mojo/url_gurl_struct_traits_unittest.cc ('K') | « url/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index e9e7ff5ed0af74bb4191cae961a4a78119083538..960342d1a6127787428b6b0ed8ad2e36ea2393a1 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',
@@ -57,6 +61,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': [
« url/mojo/url_gurl_struct_traits_unittest.cc ('K') | « url/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698