diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 17:15:02 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 17:15:02 +0000 |
| commit | 27e1136faaa841b176fd7361aa9369174a7f273d (patch) | |
| tree | b2d2ae6401aa92a08cd4bdb7d68916828b82efb3 /tools/gritsettings | |
| parent | 45cf615716a8c753f4cce10e33cd1bf569bb210f (diff) | |
| download | chromium_src-27e1136faaa841b176fd7361aa9369174a7f273d.zip chromium_src-27e1136faaa841b176fd7361aa9369174a7f273d.tar.gz chromium_src-27e1136faaa841b176fd7361aa9369174a7f273d.tar.bz2 | |
Revert 215210 "Remove webkit_chromium_resources.pak entries." because it was causing the chromium_builder_qa to fail.
I do not think the fix is complex, but I am not set up to build Chrome on Windows quickly
Builder output:
804>Time Elapsed 00:05:33.76
809>------ Build started: Project: chromium_builder_qa, Configuration: Release Win32 ------
809>Build started 8/2/2013 8:09:33 AM.
768>RC : fatal error RC1110: could not open ..\build\Release\obj\global_intermediate\webkit\webkit_chromium_resources.rc
768>
768>
768>Build FAILED.
> Remove webkit_chromium_resources.pak entries.
>
> webkit_chromium_resources.pak was kept along side with blink_resources.pak,
> while DumpRenderTree was being updated on the Blink side, since that already
> happened and Blink has rolled into Chromium, we should be able to remove this
> now.
>
> BUG=265748
> TBR=abarth@chromium.org, thestig@chromium.org
>
> Review URL: https://codereview.chromium.org/20628004
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/21937002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
| -rw-r--r-- | tools/gritsettings/resource_ids | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 0e6b848..8000821 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -66,6 +66,9 @@ "chrome_frame/resources/chrome_frame_resources.grd": { "includes": [8000], }, + "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": { + "includes": [8500], + }, "ui/base/strings/app_locale_settings.grd": { "messages": [9000], }, |