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: http://src.chromium.org/svn/trunk/src/build@118366 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
dpranke@chromium.org 2012-01-19 21:51:36 +00:00
Родитель a2da04c9f3
Коммит d06e1fc2a9
2 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -48,7 +48,7 @@
'../third_party/npapi/npapi.gyp:*',
'../third_party/ots/ots.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*',
'../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../v8/tools/gyp/v8.gyp:*',
'../webkit/support/webkit_support.gyp:*',
@ -208,7 +208,7 @@
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
'../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
'../ui/views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:
@ -253,7 +253,7 @@
'../chrome/chrome.gyp:gpu_tests',
'../chrome/chrome.gyp:performance_browser_tests',
'../chrome/chrome.gyp:performance_ui_tests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree',
'../webkit/webkit.gyp:pull_in_DumpRenderTree',
],
}, # target_name: chromium_gpu_builder
{
@ -425,7 +425,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
'../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
'../ui/views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:

Просмотреть файл

@ -672,7 +672,7 @@
# et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This
# flag should only be needed temporarily. See
# https://bugs.webkit.org/show_bug.cgi?id=68463.
'build_webkit_exes_from_webkit_gyp%': 1,
'build_webkit_exes_from_webkit_gyp%': 0,
# This flag is only used when disable_nacl==0 and disables all those
# subcomponents which would require the installation of a native_client