Add webkit.gyp:webkit target.

webkit/tools/test_shell/test_shell.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../../../build/common.gypi',
   ],
   'targets': [
     {
       'target_name': 'test_shell_common',
       'type': 'static_library',
+      'dependencies': [
+        '../../../base/base.gyp:base',
+        '../../../base/base.gyp:base_gfx',
+        '../../../testing/gtest.gyp:gtest',
+        '../../../skia/skia.gyp:skia',
+        '../../../third_party/npapi/npapi.gyp:npapi',
+        '../../webkit.gyp:glue',

[darin (slow to review), 2009/02/26 15:31:29]

perhaps we also need webkit.gyp:webkit here?

+      ],
       'sources': [
         'mac/DumpRenderTreePasteboard.h',
         'mac/DumpRenderTreePasteboard.m',
         'mac/KeystoneGlue.h',
         'mac/KeystoneGlue.m',
         'mac/test_shell_webview.h',
         'mac/test_shell_webview.mm',
         'mac/test_webview_delegate.mm',
         'mac/webview_host.mm',
         'mac/webwidget_host.mm',
@@ skipping 30 matching lines @@
         'test_webview_delegate_win.cc',
         'text_input_controller.cc',
         'text_input_controller.h',
         'webview_host.h',
         'webview_host_gtk.cc',
         'webview_host_win.cc',
         'webwidget_host.h',
         'webwidget_host_gtk.cc',
         'webwidget_host_win.cc',
       ],
-      'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../base/base.gyp:base_gfx',
-        '../../../testing/gtest.gyp:gtest',
-        '../../../skia/skia.gyp:skia',
-        '../../../third_party/npapi/npapi.gyp:npapi',
-        '../../webkit.gyp:glue',
-      ],
       'conditions': [
         ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}],
         ['OS!="mac"', {
           'sources/': [
             ['exclude', 'mac/[^/]*\\.(cc|mm?)$'],
             ['exclude', '_mac\\.(cc|mm?)$'],
           ]
         }],
         ['OS=="win"', {
           'include_dirs': [
             '../../../breakpad/src',
           ],
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # OS!=win
           'sources/': [
             ['exclude', '_win\\.cc$']
           ],
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_shell',
       'type': 'application',
+      'dependencies': [
+        'test_shell_common',
+        '../../../base/base.gyp:base',
+        '../../../net/net.gyp:net',
+        '../../webkit.gyp:glue',
+        '../../webkit.gyp:webkit',
+      ],
       'sources': [
         'test_shell_main.cc',
       ],
       'mac_bundle_resources': [
         '../../data/test_shell/',
         'mac/English.lproj/InfoPlist.strings',
         'mac/English.lproj/MainMenu.nib',
         'mac/Info.plist',
         'mac/test_shell.icns',
         'resources/AHEM____.TTF',
       ],
       'mac_bundle_resources!': [
         # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
         # that automatically sets the correct INFOPLIST_FILE setting and adds
         # the file to a source group.
         'mac/Info.plist',
       ],
-      'dependencies': [
-        'test_shell_common',
-        '../../../base/base.gyp:base',
-        '../../../net/net.gyp:net',
-        '../../webkit.gyp:glue',
-      ],
       'xcode_settings': {
         'INFOPLIST_FILE': 'mac/Info.plist',
       },
       'conditions': [
         ['OS=="mac"', {'product_name': 'TestShell'}],
       ],
     },
     {
       'target_name': 'test_shell_tests',
       'type': 'executable',
+      'dependencies': [
+        'test_shell_common',
+        '../../../base/base.gyp:base',
+        '../../../net/net.gyp:net',
+        '../../../skia/skia.gyp:skia',
+        '../../../testing/gtest.gyp:gtest',
+        '../../webkit.gyp:glue',

[darin (slow to review), 2009/02/26 15:31:29]

and here?

+      ],
       'sources': [
         '../../../skia/ext/convolver_unittest.cc',
         '../../../skia/ext/platform_canvas_unittest.cc',
         '../../../skia/ext/vector_canvas_unittest.cc',
         '../../glue/bookmarklet_unittest.cc',
         '../../glue/context_menu_unittest.cc',
         '../../glue/cpp_bound_class_unittest.cc',
         '../../glue/cpp_variant_unittest.cc',
         '../../glue/dom_operations_unittest.cc',
         '../../glue/dom_serializer_unittest.cc',
@@ skipping 16 matching lines @@
         'image_decoder_unittest.h',
         'keyboard_unittest.cc',
         'layout_test_controller_unittest.cc',
         'node_leak_test.cc',
         'plugin_tests.cc',
         'run_all_tests.cc',
         'test_shell_test.cc',
         'test_shell_test.h',
         'text_input_controller_unittest.cc',
       ],
-      'dependencies': [
-        'test_shell_common',
-        '../../../base/base.gyp:base',
-        '../../../net/net.gyp:net',
-        '../../../skia/skia.gyp:skia',
-        '../../../testing/gtest.gyp:gtest',
-        '../../webkit.gyp:glue',
-      ],
       'conditions': [
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # OS!=win
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
             '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
             'plugin_tests.cc'
           ],
         }],
       ],
     },
   ],
 }