summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp2
-rw-r--r--chrome/app/locales/locales.gyp2
-rw-r--r--chrome/chrome.gyp4
-rw-r--r--chrome/chrome_browser.gypi8
-rw-r--r--chrome/chrome_common.gypi4
-rw-r--r--chrome/chrome_dll.gypi2
-rw-r--r--chrome/chrome_renderer.gypi4
-rw-r--r--chrome/chrome_tests.gypi4
-rw-r--r--chrome/nacl.gypi2
-rw-r--r--chrome/test/interactive_ui/interactive_ui_tests.gypi2
-rw-r--r--webkit/default_plugin/default_plugin.gyp4
-rw-r--r--webkit/support/webkit_support.gyp5
-rw-r--r--webkit/support/webkit_support_in_chromium.gyp22
-rw-r--r--webkit/tools/test_shell/test_shell.gypi16
14 files changed, 27 insertions, 54 deletions
diff --git a/build/all.gyp b/build/all.gyp
index b4d2e78..00410de 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -41,7 +41,7 @@
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
'../third_party/zlib/zlib.gyp:*',
- '../webkit/support/webkit_support_in_chromium.gyp:*',
+ '../webkit/support/webkit_support.gyp:*',
'../webkit/webkit.gyp:*',
'util/build_util.gyp:*',
'temp_gyp/googleurl.gyp:*',
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index b3c8a9f..b3a856f 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -25,7 +25,7 @@
'dependencies': [
'../../chrome.gyp:chrome_strings',
'../../chrome.gyp:platform_locale_settings',
- '../../../webkit/support/webkit_support_in_chromium.gyp:webkit_strings',
+ '../../../webkit/support/webkit_support.gyp:webkit_strings',
'../../../app/app.gyp:app_strings',
],
'msvs_settings': {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 31c4e42..c216d41 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -479,7 +479,7 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
+ '../webkit/support/webkit_support.gyp:glue',
],
'include_dirs': [
'<(INTERMEDIATE_DIR)',
@@ -1381,7 +1381,7 @@
'../third_party/npapi/npapi.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
- '../webkit/support/webkit_support_in_chromium.gyp:*',
+ '../webkit/support/webkit_support.gyp:*',
'../webkit/webkit.gyp:*',
'../build/temp_gyp/googleurl.gyp:*',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1382d5c..b4c8817 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -34,10 +34,10 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
- '../webkit/support/webkit_support_in_chromium.gyp:appcache',
- '../webkit/support/webkit_support_in_chromium.gyp:database',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
- '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+ '../webkit/support/webkit_support.gyp:appcache',
+ '../webkit/support/webkit_support.gyp:database',
+ '../webkit/support/webkit_support.gyp:glue',
+ '../webkit/support/webkit_support.gyp:webkit_resources',
],
'include_dirs': [
'..',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 835c0cb..8f0e39a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -135,8 +135,8 @@
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
'../third_party/npapi/npapi.gyp:npapi',
- '../webkit/support/webkit_support_in_chromium.gyp:appcache',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
+ '../webkit/support/webkit_support.gyp:appcache',
+ '../webkit/support/webkit_support.gyp:glue',
],
'sources': [
# .cc, .h, and .mm files under chrome/common that are not required for
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 1d55f16..4255fec5 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -86,7 +86,7 @@
'../build/util/support/support.gyp:*',
'../third_party/cld/cld.gyp:cld',
'../views/views.gyp:views',
- '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+ '../webkit/support/webkit_support.gyp:webkit_resources',
'../gears/gears.gyp:gears',
],
'sources': [
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 8e92908b..14b328e 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -22,8 +22,8 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
- '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+ '../webkit/support/webkit_support.gyp:glue',
+ '../webkit/support/webkit_support.gyp:webkit_resources',
],
'include_dirs': [
'..',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f6ce069..33aa35d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -521,7 +521,7 @@
'../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
'../printing/printing.gyp:printing',
- '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+ '../webkit/support/webkit_support.gyp:webkit_resources',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -2077,7 +2077,7 @@
'../base/base.gyp:test_support_perf',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
+ '../webkit/support/webkit_support.gyp:glue',
],
'sources': [
'browser/privacy_blacklist/blacklist_perftest.cc',
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 2d73a123..b860e0f 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -69,7 +69,7 @@
'chrome_strings',
'common',
'../third_party/npapi/npapi.gyp:npapi',
- '../webkit/support/webkit_support_in_chromium.gyp:glue',
+ '../webkit/support/webkit_support.gyp:glue',
'../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome',
'../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
'../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate',
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index 1a06415..29b1786 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -21,7 +21,7 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
# run time dependency
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
],
'include_dirs': [
'<(DEPTH)',
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 999f539..10450d6 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -17,8 +17,8 @@
'../../third_party/icu/icu.gyp:icuuc',
'../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/npapi/npapi.gyp:npapi',
- '../support/webkit_support_in_chromium.gyp:webkit_resources',
- '../support/webkit_support_in_chromium.gyp:webkit_strings',
+ '../support/webkit_support.gyp:webkit_resources',
+ '../support/webkit_support.gyp:webkit_strings',
],
'include_dirs': [
'../..',
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:
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 233d18c..15eec91 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -37,11 +37,11 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:appcache',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:database',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_support',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:database',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
'<(DEPTH)/webkit/webkit.gyp:inspector_resources',
'npapi_layout_test_plugin',
],
@@ -115,7 +115,7 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:glue',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
],
'conditions': [
# http://code.google.com/p/chromium/issues/detail?id=18337
@@ -347,8 +347,8 @@
}, { # OS != "mac"
'dependencies': [
'<(DEPTH)/net/net.gyp:net_resources',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources',
- '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_strings',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
]
}],
],
generated by cgit v1.1 at 2025-02-15 00:41:12 +0000