From 7cb9b9d185985932741755f88d2889bc25362751 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 10 Feb 2010 21:11:56 +0000 Subject: Include test_shell.gypi in webkit.gyp instead of maintaining a distinct test_shell.gyp. This allows the removal of webkit.gyp:pull_in_test_shell, eliminating the circular relationship between webkit.gyp and test_shell.gyp. The expected semantics of building all of test_shell during a webkit.gyp:All build is performed are retained. This change depends on GYP r781 (in Chromium at r38526) for GYP suffix operator path section treatment. It also depends on Chromium r38519 and r38658 for common.gypi treatment of chromium_code. BUG=33186 TEST=Xcode no longer holds stale project files in memory Review URL: http://codereview.chromium.org/602006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38664 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/webkit.gyp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'webkit/webkit.gyp') diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 15f7fac..a1a8d9a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -7,6 +7,7 @@ '../third_party/WebKit/WebKit/chromium/features.gypi', '../third_party/WebKit/WebKit/chromium/WebKit.gypi', '../third_party/WebKit/WebCore/WebCore.gypi', + 'tools/test_shell/test_shell.gypi', ], 'variables': { # We can't turn on warnings on Windows and Linux until we upstream the @@ -38,13 +39,6 @@ }, 'targets': [ { - 'target_name': 'pull_in_test_shell', - 'type': 'none', - 'dependencies': [ - 'tools/test_shell/test_shell.gyp:*', - ], - }, - { 'target_name': 'pull_in_webkit_unit_tests', 'type': 'none', 'dependencies': [ -- cgit v1.1