diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 21:51:36 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 21:51:36 +0000 |
| commit | 739718036649572f5f97714b5c7feb0591645ebb (patch) | |
| tree | 7954388a6cf345759aac3a084889d4cfb2857bf9 /chrome | |
| parent | 60c1589ad7d5a3fd7ade98d4ecdbfbcd49acb2ed (diff) | |
| download | chromium_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 'chrome')
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 2c36ff5..d29a9a0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -781,7 +781,7 @@ # run time dependencies '../ppapi/ppapi_internal.gyp:ppapi_tests', '../third_party/mesa/mesa.gyp:osmesa', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', + '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', ], 'include_dirs': [ '..', @@ -2471,7 +2471,7 @@ '../webkit/webkit.gyp:test_shell_test_support', # Runtime dependencies '../third_party/mesa/mesa.gyp:osmesa', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', + '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', ], 'include_dirs': [ '..', @@ -3152,7 +3152,7 @@ '../webkit/webkit.gyp:test_shell_test_support', # Runtime dependencies '../third_party/mesa/mesa.gyp:osmesa', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', + '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', ], 'include_dirs': [ '..', |