summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 16:33:19 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 16:33:19 +0000
commit19e00edbf03b3e2cc590c3905b6293be865c6f2d (patch)
treee06e562352fa7d16d534119f45c7a546a19320c1 /webkit
parent3dda33d5473684ec0e00ea99c678d7b7ef401ef8 (diff)
downloadchromium_src-19e00edbf03b3e2cc590c3905b6293be865c6f2d.zip
chromium_src-19e00edbf03b3e2cc590c3905b6293be865c6f2d.tar.gz
chromium_src-19e00edbf03b3e2cc590c3905b6293be865c6f2d.tar.bz2
Leverage the awesome power of export_dependent_settings
Review URL: http://codereview.chromium.org/27214 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp17
1 files changed, 9 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index f2ddb56..d92d29a 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -16,10 +16,12 @@
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_gfx',
- '../../../testing/gtest.gyp:gtest',
+ '../../../net/net.gyp:net',
'../../../skia/skia.gyp:skia',
+ '../../../testing/gtest.gyp:gtest',
'../../../third_party/npapi/npapi.gyp:npapi',
'../../webkit.gyp:glue',
+ '../../webkit.gyp:webkit',
],
'sources': [
'mac/DumpRenderTreePasteboard.h',
@@ -71,6 +73,12 @@
'webwidget_host_gtk.cc',
'webwidget_host_win.cc',
],
+ 'export_dependent_settings': [
+ '../../../base/base.gyp:base',
+ '../../../net/net.gyp:net',
+ '../../webkit.gyp:glue',
+ '../../webkit.gyp:webkit',
+ ],
'conditions': [
['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}],
['OS!="mac"', {
@@ -100,10 +108,6 @@
'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',
@@ -134,11 +138,8 @@
'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',
],
'sources': [
'../../../skia/ext/convolver_unittest.cc',