diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/default_plugin/default_plugin.gyp | 4 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gyp | 5 | ||||
| -rw-r--r-- | webkit/support/webkit_support_in_chromium.gyp | 22 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 16 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 4 |
5 files changed, 36 insertions, 15 deletions
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index 0ceaa4b..999f539 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', - '../webkit.gyp:webkit_resources', - '../webkit.gyp:webkit_strings', + '../support/webkit_support_in_chromium.gyp:webkit_resources', + '../support/webkit_support_in_chromium.gyp:webkit_strings', ], 'include_dirs': [ '../..', diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index be19855..5b59e76 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -3,7 +3,10 @@ # found in the LICENSE file. { - # Suppose this file is put at WebKit/WebKit/chromium/webkit/support/. + # 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', diff --git a/webkit/support/webkit_support_in_chromium.gyp b/webkit/support/webkit_support_in_chromium.gyp new file mode 100644 index 0000000..1f435cf --- /dev/null +++ b/webkit/support/webkit_support_in_chromium.gyp @@ -0,0 +1,22 @@ +# 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 c5a4d84..233d18c 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -37,12 +37,12 @@ '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', - '<(DEPTH)/webkit/webkit.gyp:appcache', - '<(DEPTH)/webkit/webkit.gyp:database', - '<(DEPTH)/webkit/webkit.gyp:glue', + '<(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/webkit.gyp:inspector_resources', - '<(DEPTH)/webkit/webkit.gyp:webkit_resources', - '<(DEPTH)/webkit/webkit.gyp:webkit_support', 'npapi_layout_test_plugin', ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', @@ -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/webkit.gyp:glue', + '<(DEPTH)/webkit/support/webkit_support_in_chromium.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/webkit.gyp:webkit_resources', - '<(DEPTH)/webkit/webkit.gyp:webkit_strings', + '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources', + '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_strings', ] }], ], diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 373073e..5fa7bae 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -7,10 +7,6 @@ '../third_party/WebKit/WebKit/chromium/features.gypi', '../third_party/WebKit/WebKit/chromium/WebKit.gypi', '../third_party/WebKit/WebCore/WebCore.gypi', - 'appcache/webkit_appcache.gypi', - 'database/webkit_database.gypi', - 'glue/webkit_glue.gypi', - 'support/webkit_support.gypi', 'tools/test_shell/test_shell.gypi', ], 'variables': { |