| Index: mojo/mojo_public.gyp
|
| diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
|
| index 901b2aca3a3d51c419519074139f9e23723698b8..d1395366e1b4c868d18f90dcbf3153fc91885c88 100644
|
| --- a/mojo/mojo_public.gyp
|
| +++ b/mojo/mojo_public.gyp
|
| @@ -239,36 +239,6 @@
|
| ],
|
| },
|
| {
|
| - # GN version: //mojo/public/cpp/bindings:wtf_support
|
| - 'target_name': 'mojo_cpp_bindings_wtf_support',
|
| - 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '..'
|
| - ],
|
| - 'sources': [
|
| - 'public/cpp/bindings/array_traits_wtf.h',
|
| - 'public/cpp/bindings/array_traits_wtf_vector.h',
|
| - 'public/cpp/bindings/lib/string_traits_wtf.cc',
|
| - 'public/cpp/bindings/lib/wtf_serialization.h',
|
| - 'public/cpp/bindings/string_traits_wtf.h',
|
| - 'public/cpp/bindings/wtf_array.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' ],
|
| - },
|
| - },
|
| - },
|
| - {
|
| # GN version: //mojo/message_pump
|
| 'target_name': 'mojo_message_pump_lib',
|
| 'type': '<(component)',
|
| @@ -412,19 +382,6 @@
|
| 'includes': [ 'mojom_bindings_generator.gypi' ],
|
| },
|
| {
|
| - 'target_name': 'mojo_public_test_interfaces_mojom_blink',
|
| - 'type': 'none',
|
| - 'variables': {
|
| - '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' ],
|
| - },
|
| - {
|
| # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
|
| 'target_name': 'mojo_public_test_interfaces',
|
| 'type': 'static_library',
|
| @@ -440,22 +397,6 @@
|
| ],
|
| },
|
| {
|
| - # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_blink
|
| - 'target_name': 'mojo_public_test_interfaces_blink',
|
| - 'type': 'static_library',
|
| - 'export_dependent_settings': [
|
| - 'mojo_public_test_interfaces_mojom_blink',
|
| - 'mojo_cpp_bindings',
|
| - ],
|
| - 'sources': [
|
| - 'public/cpp/bindings/tests/pickled_struct_blink.cc',
|
| - ],
|
| - 'dependencies': [
|
| - 'mojo_public_test_interfaces_mojom_blink',
|
| - 'mojo_cpp_bindings',
|
| - ],
|
| - },
|
| - {
|
| 'target_name': 'mojo_public_test_associated_interfaces_mojom',
|
| 'type': 'none',
|
| 'variables': {
|
| @@ -489,17 +430,6 @@
|
| ],
|
| 'includes': [ 'mojom_bindings_generator.gypi' ],
|
| },
|
| - {
|
| - 'target_name': 'mojo_public_test_wtf_types_blink',
|
| - 'type': 'static_library',
|
| - 'variables': {
|
| - 'for_blink': 'true',
|
| - },
|
| - 'sources': [
|
| - 'public/interfaces/bindings/tests/test_wtf_types.mojom',
|
| - ],
|
| - 'includes': [ 'mojom_bindings_generator.gypi' ],
|
| - },
|
| ],
|
| 'conditions': [
|
| ['OS == "android"', {
|
| @@ -538,5 +468,79 @@
|
| },
|
| ],
|
| }],
|
| + ['OS != "ios"', {
|
| + 'targets': [
|
| + {
|
| + # GN version: //mojo/public/cpp/bindings:wtf_support
|
| + 'target_name': 'mojo_cpp_bindings_wtf_support',
|
| + 'type': 'static_library',
|
| + 'include_dirs': [
|
| + '..'
|
| + ],
|
| + 'sources': [
|
| + 'public/cpp/bindings/array_traits_wtf.h',
|
| + 'public/cpp/bindings/array_traits_wtf_vector.h',
|
| + 'public/cpp/bindings/lib/string_traits_wtf.cc',
|
| + 'public/cpp/bindings/lib/wtf_serialization.h',
|
| + 'public/cpp/bindings/string_traits_wtf.h',
|
| + 'public/cpp/bindings/wtf_array.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' ],
|
| + },
|
| + },
|
| + },
|
| + {
|
| + 'target_name': 'mojo_public_test_interfaces_mojom_blink',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + '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' ],
|
| + },
|
| + {
|
| + # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_blink
|
| + 'target_name': 'mojo_public_test_interfaces_blink',
|
| + 'type': 'static_library',
|
| + 'export_dependent_settings': [
|
| + 'mojo_public_test_interfaces_mojom_blink',
|
| + 'mojo_cpp_bindings',
|
| + ],
|
| + 'sources': [
|
| + 'public/cpp/bindings/tests/pickled_struct_blink.cc',
|
| + ],
|
| + 'dependencies': [
|
| + 'mojo_public_test_interfaces_mojom_blink',
|
| + 'mojo_cpp_bindings',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'mojo_public_test_wtf_types_blink',
|
| + 'type': 'static_library',
|
| + 'variables': {
|
| + 'for_blink': 'true',
|
| + },
|
| + 'sources': [
|
| + 'public/interfaces/bindings/tests/test_wtf_types.mojom',
|
| + ],
|
| + 'includes': [ 'mojom_bindings_generator.gypi' ],
|
| + },
|
| + ],
|
| + }],
|
| ],
|
| }
|
|
|