[iOS] Remove dependency third_party/WebKit on iOS.

mojo/mojo_public.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     'mojo_variables.gypi',
   ],
   'target_defaults' : {
     'include_dirs': [
@@ skipping 220 matching lines @@
         # This comes from the mojo_interface_bindings_cpp_sources dependency.
         '>@(mojom_generated_sources)',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         'mojo_cpp_system',
         'mojo_interface_bindings_cpp_sources',
       ],
     },
     {
-      # 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',

[Nico, 2016/06/06 14:06:27]

btw, do you know who added these? things outside of blink depending on WebKit
without going through the webkit api seems strange to me.

[sdefresne, 2016/06/06 14:14:58]

It was added by https://codereview.chromium.org/1751563002.

-        '../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:06:27]

and this looks definitely very incorrect too :-/

[sdefresne, 2016/06/06 14:14:58]

Same CL.

-        },
-      },
-    },
-    {
       # GN version: //mojo/message_pump
       'target_name': 'mojo_message_pump_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_MESSAGE_PUMP_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(mojo_system_for_component)',
@@ skipping 123 matching lines @@
           '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' ],
     },
     {
-      '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',
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'sources': [
         'public/cpp/bindings/tests/pickled_struct_chromium.cc',
       ],
       'dependencies': [
         'mojo_public_test_interfaces_mojom',
         'mojo_cpp_bindings',
       ],
     },
     {
-      # 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': {
         # These files are not included in the mojo_public_test_interfaces_mojom
         # target because associated interfaces are not supported by all bindings
         # languages yet.
         'mojom_files': [
           'public/interfaces/bindings/tests/test_associated_interfaces.mojom',
           'public/interfaces/bindings/tests/validation_test_associated_interfaces.mojom',
         ],
@@ skipping 13 matching lines @@
       ],
     },
     {
       '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': {
-        'for_blink': 'true',
-      },
-      'sources': [
-        'public/interfaces/bindings/tests/test_wtf_types.mojom',
-      ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
-    },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           # GN version: //mojo/public/java:system
           'target_name': 'mojo_public_java',
           'type': 'none',
           'variables': {
             'chromium_code': 0,
@@ skipping 18 matching lines @@
            },
            'dependencies': [
              'mojo_interface_bindings_java_sources',
              'mojo_public_java',
              '<(DEPTH)/base/base.gyp:base_java',
            ],
            'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
+    ['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' ],
+        },
+      ],
+    }],
   ],
 }