Commit 8576d4ca authored by yzshen's avatar yzshen Committed by Commit bot

Mojo C++ bindings GYP build: only unset "-Wglobal-constructors' for unittests...

Mojo C++ bindings GYP build: only unset "-Wglobal-constructors' for unittests depending on WTF types.

BUG=583738

Review-Url: https://codereview.chromium.org/2038413003
Cr-Commit-Position: refs/heads/master@{#398162}
parent 9e147e0f
...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
'mojo_public.gyp:mojo_public_test_interfaces_struct_traits', 'mojo_public.gyp:mojo_public_test_interfaces_struct_traits',
'mojo_public.gyp:mojo_public_test_utils', 'mojo_public.gyp:mojo_public_test_utils',
], ],
'variables': {
'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
},
'sources': [ 'sources': [
'public/cpp/bindings/tests/array_common_test.h', 'public/cpp/bindings/tests/array_common_test.h',
'public/cpp/bindings/tests/array_unittest.cc', 'public/cpp/bindings/tests/array_unittest.cc',
...@@ -92,6 +95,9 @@ ...@@ -92,6 +95,9 @@
'public/cpp/bindings/tests/variant_test_util.h', 'public/cpp/bindings/tests/variant_test_util.h',
], ],
'conditions': [ 'conditions': [
# TODO(yzshen): Blink-flavor bindings tests should be moved into
# mojo_public_bindings_for_blink_tests (which should eventually be moved
# into blink).
['OS=="ios"', { ['OS=="ios"', {
'dependencies!': [ 'dependencies!': [
'mojo_public.gyp:mojo_public_test_interfaces_blink', 'mojo_public.gyp:mojo_public_test_interfaces_blink',
...@@ -120,6 +126,9 @@ ...@@ -120,6 +126,9 @@
'mojo_public.gyp:mojo_public_test_wtf_types', 'mojo_public.gyp:mojo_public_test_wtf_types',
'mojo_public.gyp:mojo_public_test_wtf_types_blink', 'mojo_public.gyp:mojo_public_test_wtf_types_blink',
], ],
'variables': {
'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
},
'sources': [ 'sources': [
'public/cpp/bindings/tests/array_common_test.h', 'public/cpp/bindings/tests/array_common_test.h',
'public/cpp/bindings/tests/container_test_util.cc', 'public/cpp/bindings/tests/container_test_util.cc',
......
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
], ],
}, },
{ {
# TODO(yzshen): crbug.com/617718 Consider moving this into blink.
# GN version: //mojo/public/cpp/bindings:wtf_support # GN version: //mojo/public/cpp/bindings:wtf_support
'target_name': 'mojo_cpp_bindings_wtf_support', 'target_name': 'mojo_cpp_bindings_wtf_support',
'type': 'static_library', 'type': 'static_library',
...@@ -261,11 +262,6 @@ ...@@ -261,11 +262,6 @@
'mojo_cpp_bindings', 'mojo_cpp_bindings',
'../third_party/WebKit/Source/config.gyp:config', '../third_party/WebKit/Source/config.gyp:config',
], ],
'direct_dependent_settings': {
'variables': {
'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
},
},
}, },
{ {
# GN version: //mojo/message_pump # GN version: //mojo/message_pump
......
...@@ -146,6 +146,7 @@ source_set("struct_traits") { ...@@ -146,6 +146,7 @@ source_set("struct_traits") {
} }
if (!is_ios) { if (!is_ios) {
# TODO(yzshen): crbug.com/617718 Consider moving this into blink.
source_set("wtf_support") { source_set("wtf_support") {
sources = [ sources = [
"array_traits_wtf.h", "array_traits_wtf.h",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment