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

Unified Diff: mojo/mojo_public.gyp

Issue 1751563002: Mojo C++ bindings: support mapping mojo string to WTF::String. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync & rebase Created 4 years, 9 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
« no previous file with comments | « mojo/mojo_edk_tests.gyp ('k') | mojo/mojom_bindings_generator.gypi » ('j') | no next file with comments »
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 28441951f82eb797a4fa67840f0376988d11ebce..da318aef42239a6d8ff59537fd3dd8393eba44ca 100644
--- a/mojo/mojo_public.gyp
+++ b/mojo/mojo_public.gyp
@@ -177,6 +177,9 @@
'public/cpp/bindings/lib/validation_util.cc',
'public/cpp/bindings/lib/validation_util.h',
'public/cpp/bindings/lib/value_traits.h',
+ # Include the .h but not the .cc file. The .h file is used by
+ # serialization_forward.h.
+ 'public/cpp/bindings/lib/wtf_string_serialization.h',
'public/cpp/bindings/message.h',
'public/cpp/bindings/message_filter.h',
'public/cpp/bindings/no_interface.h',
@@ -194,6 +197,33 @@
],
},
{
+ # GN version: //mojo/public/cpp/bindings:wtf_support
+ 'target_name': 'mojo_cpp_bindings_wtf_support',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..'
+ ],
+ 'sources': [
+ 'public/cpp/bindings/lib/wtf_serialization.h',
+ 'public/cpp/bindings/lib/wtf_string_serialization.cc',
+ 'public/cpp/bindings/lib/wtf_string_serialization.h',
+ ],
+ 'dependencies': [
+ 'mojo_cpp_bindings',
+ '../third_party/WebKit/Source/config.gyp:config',
+ '../third_party/WebKit/Source/wtf/wtf.gyp:wtf',
+ ],
+ 'export_dependent_settings': [
+ 'mojo_cpp_bindings',
+ '../third_party/WebKit/Source/config.gyp:config',
+ ],
+ 'direct_dependent_settings': {
+ 'variables': {
+ 'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
Nico 2016/06/06 14:27:48 this looks incorrect. why do you need this?
+ },
+ },
+ },
+ {
# GN version: //mojo/message_pump
'target_name': 'mojo_message_pump_lib',
'type': '<(component)',
@@ -456,6 +486,26 @@
'mojo_cpp_bindings',
],
},
+ {
+ 'target_name': 'mojo_public_test_wtf_types',
+ 'type': 'static_library',
+ 'sources': [
+ 'public/interfaces/bindings/tests/test_wtf_types.mojom',
+ ],
+ 'includes': [ 'mojom_bindings_generator.gypi' ],
+ },
+ {
+ 'target_name': 'mojo_public_test_wtf_types_blink',
+ 'type': 'static_library',
+ 'variables': {
+ 'mojom_variant': 'blink',
+ 'for_blink': 'true',
+ },
+ 'sources': [
+ 'public/interfaces/bindings/tests/test_wtf_types.mojom',
+ ],
+ 'includes': [ 'mojom_bindings_generator.gypi' ],
+ },
],
'conditions': [
['OS == "android"', {
« no previous file with comments | « mojo/mojo_edk_tests.gyp ('k') | mojo/mojom_bindings_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698