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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_public.gyp

Issue 1832703002: Mojo: Simplify typemap usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-bindings-variant-import
Patch Set: Created 4 years, 8 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
« gpu/command_buffer/common/capabilities.typemap ('K') | « mojo/mojo_edk_tests.gyp ('k') | mojo/mojom_bindings_generator.gypi » ('j') | mojo/mojom_bindings_generator_explicit.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gyp
diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
index 054fe4de595fbe64a6e53ecb84b0c4e675e3b5bd..b901a4d0daa7c129dc1b3253ae00b6ba4133e241 100644
--- a/mojo/mojo_public.gyp
+++ b/mojo/mojo_public.gyp
@@ -27,10 +27,9 @@
'public/interfaces/bindings/tests/serialization_test_structs.mojom',
'public/interfaces/bindings/tests/test_constants.mojom',
'public/interfaces/bindings/tests/test_native_types.mojom',
- 'public/interfaces/bindings/tests/test_structs.mojom',
'public/interfaces/bindings/tests/test_sync_methods.mojom',
- 'public/interfaces/bindings/tests/test_unions.mojom',
- 'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+ 'public/interfaces/bindings/tests/test_variant.mojom',
+ 'public/interfaces/bindings/tests/test_variant_import.mojom',
]
},
'targets': [
@@ -382,7 +381,16 @@
'target_name': 'mojo_public_test_interfaces_mojom',
'type': 'none',
'variables': {
- 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
+ 'mojom_files': [
+ 'public/interfaces/bindings/tests/test_structs.mojom',
+ 'public/interfaces/bindings/tests/test_unions.mojom',
+ 'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+ '<@(mojo_public_test_interfaces_mojom_files)',
+ ],
+ 'mojom_typemaps': [
+ 'public/cpp/bindings/tests/rect_chromium.typemap',
+ 'public/cpp/bindings/tests/test_native_types_chromium.typemap',
+ ],
},
'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
},
@@ -390,12 +398,13 @@
'target_name': 'mojo_public_test_interfaces_struct_traits',
'type': 'static_library',
'variables': {
- 'mojom_extra_generator_args': [
- '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/struct_with_traits.typemap',
+ 'mojom_typemaps': [
+ 'public/cpp/bindings/tests/struct_with_traits.typemap',
],
},
'sources': [
'public/interfaces/bindings/tests/struct_with_traits.mojom',
+ 'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc',
],
'includes': [ 'mojom_bindings_generator.gypi' ],
},
@@ -403,31 +412,15 @@
'target_name': 'mojo_public_test_interfaces_mojom_blink',
'type': 'none',
'variables': {
- 'mojom_variant': 'blink',
- 'mojom_extra_generator_args': [
- '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/blink_test.typemap',
- ],
- 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
- },
- 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
- 'dependencies': [
- 'mojo_public_test_interfaces_mojom',
- ],
- },
- {
- 'target_name': 'mojo_public_test_interfaces_mojom_chromium',
- 'type': 'none',
- 'variables': {
- 'mojom_variant': 'chromium',
- 'mojom_extra_generator_args': [
- '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/chromium_test.typemap',
+ 'mojom_variant': 'wtf',
+ 'for_blink': 'true',
+ 'mojom_typemaps': [
+ 'public/cpp/bindings/tests/rect_blink.typemap',
+ 'public/cpp/bindings/tests/test_native_types_blink.typemap',
],
'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
},
'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
- 'dependencies': [
- 'mojo_public_test_interfaces_mojom',
- ],
},
{
# GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
@@ -436,6 +429,9 @@
'export_dependent_settings': [
'mojo_cpp_bindings',
],
+ 'sources': [
+ 'public/cpp/bindings/tests/pickled_struct_chromium.cc',
+ ],
'dependencies': [
'mojo_public_test_interfaces_mojom',
'mojo_cpp_bindings',
@@ -446,22 +442,14 @@
'target_name': 'mojo_public_test_interfaces_blink',
'type': 'static_library',
'export_dependent_settings': [
- 'mojo_cpp_bindings',
- ],
- 'dependencies': [
'mojo_public_test_interfaces_mojom_blink',
'mojo_cpp_bindings',
],
- },
- {
- # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_chromium
- 'target_name': 'mojo_public_test_interfaces_chromium',
- 'type': 'static_library',
- 'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'sources': [
+ 'public/cpp/bindings/tests/pickled_struct_blink.cc',
],
'dependencies': [
- 'mojo_public_test_interfaces_mojom_chromium',
+ 'mojo_public_test_interfaces_mojom_blink',
'mojo_cpp_bindings',
],
},
@@ -503,7 +491,7 @@
'target_name': 'mojo_public_test_wtf_types_blink',
'type': 'static_library',
'variables': {
- 'mojom_variant': 'blink',
+ 'mojom_variant': 'wtf',
'for_blink': 'true',
},
'sources': [
@@ -511,18 +499,6 @@
],
'includes': [ 'mojom_bindings_generator.gypi' ],
},
- {
- 'target_name': 'mojo_public_test_variant',
- 'type': 'static_library',
- 'variables': {
- 'mojom_variant': 'test_variant',
yzshen1 2016/04/05 17:36:14 Instead of moving them into "mojo_public_test_inte
Sam McNally 2016/04/06 07:02:53 Deleted them.
- },
- 'sources': [
- 'public/interfaces/bindings/tests/test_variant_import.mojom',
- 'public/interfaces/bindings/tests/test_variant.mojom',
- ],
- 'includes': [ 'mojom_bindings_generator.gypi' ],
- },
],
'conditions': [
['OS == "android"', {
« gpu/command_buffer/common/capabilities.typemap ('K') | « mojo/mojo_edk_tests.gyp ('k') | mojo/mojom_bindings_generator.gypi » ('j') | mojo/mojom_bindings_generator_explicit.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698