summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 21:51:36 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 21:51:36 +0000
commit739718036649572f5f97714b5c7feb0591645ebb (patch)
tree7954388a6cf345759aac3a084889d4cfb2857bf9 /webkit/tools
parent60c1589ad7d5a3fd7ade98d4ecdbfbcd49acb2ed (diff)
downloadchromium_src-739718036649572f5f97714b5c7feb0591645ebb.zip
chromium_src-739718036649572f5f97714b5c7feb0591645ebb.tar.gz
chromium_src-739718036649572f5f97714b5c7feb0591645ebb.tar.bz2
build DRT, webkit_unit_tests from individual gyp files.
This change toggles the build_webkit_exes_from_webkit_gyp file to 0, so that we try to build DumpRenderTree and webkit_unit_tests from their corresponding .gyp files (WebKitUnitTests.gyp and Tools.gyp) rather than the old WebKit.gyp file. This breaks the circular dependencies between the executables which depend on webkit_support, which depends on WebKit.gyp. We now only use the 'webkit' target itself in WebKit.gyp. R=tony@chromium.org BUG=105826 TEST=waterfall stays green Review URL: https://chromiumcodereview.appspot.com/8889039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index c1f9e35..5e514c7 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -206,7 +206,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
+ 'pull_in_copy_TestNetscapePlugIn',
'<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff',
],
'defines': [