Bug 76879 - [chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets that depend on WebKit API so they pick up the copied headers in an onion build
Summary: [chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets t...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: James Robinson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-23 16:36 PST by James Robinson
Modified: 2012-01-23 17:09 PST (History)
0 users

See Also:


Attachments
Patch (1.67 KB, patch)
2012-01-23 16:36 PST, James Robinson
no flags Details | Formatted Diff | Diff
Patch (1.60 KB, patch)
2012-01-23 16:51 PST, James Robinson
dpranke: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description James Robinson 2012-01-23 16:36:20 PST
[chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets that depend on WebKit API so they pick up the copied headers in an onion build
Comment 1 James Robinson 2012-01-23 16:36:50 PST
Created attachment 123655 [details]
Patch
Comment 2 James Robinson 2012-01-23 16:41:12 PST
The particular problem this solves is that this target: http://src.chromium.org/viewvc/chrome/trunk/src/ppapi/ppapi_shared.gypi?view=markup has a dependency directly on <(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit and files with includes that look like #include "third_party/WebKit/Source/WebKit/...". In a chromium-inside-WebKit checkout we resolve includes by this by generating copies of headers into <(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/... via the setup_third_party.py script in webkit_support.

Most (all?) targets in webkit/*/ add this include_dir in other ways, so this only impacts chromium code that directly depends on third_party/WebKit/... which is probably why we haven't seen it in other places.
Comment 3 Dirk Pranke 2012-01-23 16:47:12 PST
Comment on attachment 123655 [details]
Patch

please wrap this in a inside_chromium_build==0 block.
Comment 4 James Robinson 2012-01-23 16:51:16 PST
Created attachment 123661 [details]
Patch
Comment 5 James Robinson 2012-01-23 17:09:41 PST
Committed r105662: <http://trac.webkit.org/changeset/105662>