[chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets that...

https://bugs.webkit.org/show_bug.cgi?id=76879

Reviewed by Dirk Pranke.

* WebKit.gyp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 29852cd..363845d 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-23  James Robinson  <jamesr@chromium.org>
+
+        [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
+        https://bugs.webkit.org/show_bug.cgi?id=76879
+
+        Reviewed by Dirk Pranke.
+
+        * WebKit.gyp:
+
 2012-01-23  Stephen White  <senorblanco@chromium.org>
 
         Unreviewed, rolling out r105640.

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index 5f64596..ace1235 100644 (file)
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -768,6 +768,12 @@
                             },
                         }],
                     ],
+                }, { # else: inside_chromium_build==0
+                    'direct_dependent_settings': {
+                        'include_dirs': [
+                            '<(SHARED_INTERMEDIATE_DIR)/webkit', # in a chromium-inside-WebKit build, headers in the public WebKit API are copied beneath this directory so includes referencing third_party/WebKit work.
+                        ],
+                    },
                 }],
                 ['use_x11 == 1', {
                     'dependencies': [