diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 01:12:32 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 01:12:32 +0000 |
| commit | c4c9f2cb04a7558f78b1339c37b1ca7a0d92570d (patch) | |
| tree | fe3f62cf0b30d7795682e73c9994d71e435e9ae2 | |
| parent | 67c2610bc1a4a3ae776ed87507c57eed98dd36ea (diff) | |
| download | chromium_src-c4c9f2cb04a7558f78b1339c37b1ca7a0d92570d.zip chromium_src-c4c9f2cb04a7558f78b1339c37b1ca7a0d92570d.tar.gz chromium_src-c4c9f2cb04a7558f78b1339c37b1ca7a0d92570d.tar.bz2 | |
This change seems dumb, but it works.
Apparently, WebCore/html and the DerivedSources both include an HTMLElementFactory.h -- each of which prototype the same functions, but with different signatures >:(. The reason this doesn't seem to be a problem upstream is that their include paths pull in WebCore/html before they pull in the DerivedSources.
In our case, these include paths come from two separate .vsprops. The .vsprops seem to be considered last-first, so if we include foo.vsprops and bar.vsprops, the resulting merged include path is "bar/;foo/". So I just swap the .vsprops that contains DerivedSources with the one that contains WebCore/html.
There may be a better fix. From the actual list of headers in the upstream projects, it's not clear HTMLElementFactory.h is even still supposed to _be_ autogenerated. If it isn't, and it just hasn't been noticed due to this include path issue, then perhaps we should do a local+upstream patch to stop it from being generated at all. However, I haven't yet been able to figure out why this file gets generated :(.
Comments welcome.
Review URL: http://codereview.chromium.org/7045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3167 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/build/webkit_common.vsprops | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/build/webkit_common.vsprops b/webkit/build/webkit_common.vsprops index 0fb2e13..15be177 100644 --- a/webkit/build/webkit_common.vsprops +++ b/webkit/build/webkit_common.vsprops @@ -3,6 +3,6 @@ ProjectType="Visual C++" Version="8.00" Name="webkit_common" - InheritedPropertySheets=".\webkit_common_includes.vsprops;.\webkit_common_defines.vsprops;.\js_engine$(JS_ENGINE_TYPE).vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops" + InheritedPropertySheets=".\js_engine$(JS_ENGINE_TYPE).vsprops;.\webkit_common_includes.vsprops;.\webkit_common_defines.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops" > </VisualStudioPropertySheet> |