summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 03:21:55 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 03:21:55 +0000
commit69d3dfe8185ca6971fcd39ea008f807275a31e5a (patch)
tree37b85ab1315840ff4e340bc05d169f0ca1e20d68 /webkit/support
parent1437d2483fd7a5121f1dda82804c0133b24e78cb (diff)
downloadchromium_src-69d3dfe8185ca6971fcd39ea008f807275a31e5a.zip
chromium_src-69d3dfe8185ca6971fcd39ea008f807275a31e5a.tar.gz
chromium_src-69d3dfe8185ca6971fcd39ea008f807275a31e5a.tar.bz2
Remove webkit_support_in_chromium.gyp and use webkit_support.gyp
instead. features.gypi isn't needed by glue, appcache or database. Review URL: http://codereview.chromium.org/2070001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.gyp5
-rw-r--r--webkit/support/webkit_support_in_chromium.gyp22
2 files changed, 0 insertions, 27 deletions
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 5b59e76..fa9256a 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -3,12 +3,7 @@
# found in the LICENSE file.
{
- # This file is the same as webkit_support_in_chromium.gyp except it
- # references features.gypi based on its location in a webkit checkout
- # (WebKit/Webkit/chromium/webkit/support/). If you add .gypi files
- # here, please add them in webkit_support_in_chromium.gyp as well.
'includes': [
- '../../features.gypi',
'../appcache/webkit_appcache.gypi',
'../database/webkit_database.gypi',
'../glue/webkit_glue.gypi',
diff --git a/webkit/support/webkit_support_in_chromium.gyp b/webkit/support/webkit_support_in_chromium.gyp
deleted file mode 100644
index 1f435cf..0000000
--- a/webkit/support/webkit_support_in_chromium.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2010 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.
-
-{
- # This file is the same as webkit_support.gyp except it references
- # features.gypi based on its location in a chromium checkout. If you
- # add .gypi files here, please add them in webkit_support.gyp as well.
- 'includes': [
- '../../third_party/WebKit/WebKit/chromium/features.gypi',
- '../appcache/webkit_appcache.gypi',
- '../database/webkit_database.gypi',
- '../glue/webkit_glue.gypi',
- 'webkit_support.gypi',
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: