diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 20:05:52 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 20:05:52 +0000 |
| commit | 249d9b53d2a65a8eda83b19bf41a4147978afe43 (patch) | |
| tree | 1949ff3b982bf7c0930d69c735400ee2a6b512e5 /webkit | |
| parent | 42cb6f8879b4355e13ce22644beda97e9495ecfd (diff) | |
| download | chromium_src-249d9b53d2a65a8eda83b19bf41a4147978afe43.zip chromium_src-249d9b53d2a65a8eda83b19bf41a4147978afe43.tar.gz chromium_src-249d9b53d2a65a8eda83b19bf41a4147978afe43.tar.bz2 | |
remove webkit.gyp (and the test_shell target) and update affected targets
We had some old dummy targets left over in webkit.gyp that were used when
we had to jump through hoops to build webkit-related targets. We don't need
these any more.
We also don't need the dummy test_shell target, as no builder should be
trying to build test_shell directly at this point.
R=darin@chromium.org, jamesr@chromium.org
BUG=247105
Review URL: https://codereview.chromium.org/16300009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/test_shell_dummy.cc | 7 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 51 |
2 files changed, 0 insertions, 58 deletions
diff --git a/webkit/support/test_shell_dummy.cc b/webkit/support/test_shell_dummy.cc deleted file mode 100644 index e1a88a9..0000000 --- a/webkit/support/test_shell_dummy.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -// TODO(darin): Delete this once the build masters stop referencing test_shell. -void Dummy() { -} diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp deleted file mode 100644 index 8805a8c..0000000 --- a/webkit/webkit.gyp +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (c) 2012 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': [ - '../build/win_precompile.gypi', - ], - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'pull_in_webkit_unit_tests', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests' - ], - }, - { - 'target_name': 'pull_in_DumpRenderTree', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree' - ], - }, - { - 'target_name': 'pull_in_copy_TestNetscapePlugIn', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn' - ], - }, - ], - 'conditions': [ - # Currently test_shell compiles only on Windows, Mac, and Gtk. - ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', { - 'targets': [ - { - # TODO(darin): Delete this dummy target once the build masters stop - # trying to build it. - 'target_name': 'test_shell', - 'type': 'static_library', - 'sources': [ - 'support/test_shell_dummy.cc', - ], - }, - ], - }], - ], -} |