summaryrefslogtreecommitdiffstats
path: root/chrome/test/browser
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 04:29:55 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 04:29:55 +0000
commit5b67b116e9caa53d1aa5a62129431c8d7f5473be (patch)
tree598889e4d9c67b1139f0ca19e4c3244b97be4b2f /chrome/test/browser
parent7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff (diff)
downloadchromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.zip
chromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.tar.gz
chromium_src-5b67b116e9caa53d1aa5a62129431c8d7f5473be.tar.bz2
Convert the webkit build on Windows to gyp:
* build\all.gyp now uses webkit\webkit.gyp and webkit\tools\test_shell\test_shell.gyp. * 'svn remove' checked-in .sln and .vcproj files that will now become gyp-generated files. (We'll leave the other old ones in place, uncalled, and remove them with a later CL.) * Add generated *.sln and *.vcproj files to svn:ignore on the relevant directories. * Update various chrome\**.vcproj files with the new gyp directory in which various generated webkit files will now appear. * Update the checked-in chrome\chrome.sln with all (?) the changes necessary to reflect the new gyp generation. Review URL: http://codereview.chromium.org/115115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/browser')
-rw-r--r--chrome/test/browser/browser_tests_dll.vcproj2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/browser/browser_tests_dll.vcproj b/chrome/test/browser/browser_tests_dll.vcproj
index 8c1658f..b531402 100644
--- a/chrome/test/browser/browser_tests_dll.vcproj
+++ b/chrome/test/browser/browser_tests_dll.vcproj
@@ -278,7 +278,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
+ RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc"
>
</File>
<File