summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 18:21:53 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 18:21:53 +0000
commit21f3fe0616125a0716edd6f28fbf4465ebf4d824 (patch)
treed8df66e64d728ebf274ea2c5dd389b37036fddfc
parentc75726b96587ee6809f24f27a9286dceb5c75110 (diff)
downloadchromium_src-21f3fe0616125a0716edd6f28fbf4465ebf4d824.zip
chromium_src-21f3fe0616125a0716edd6f28fbf4465ebf4d824.tar.gz
chromium_src-21f3fe0616125a0716edd6f28fbf4465ebf4d824.tar.bz2
Add <(SHARED_INTERMEDIATE_DIR)/webkit to webkit_compositor_support target to work in WebKit checkout
In a webkit checkout using the chromium port, chromium files that use includes of the form "third_party/WebKit/.." work thanks to a gyp step that maps WebKit headers into the shared intermediate dir. For this to work, all targets that are compiled on the WebKit side in this configuration have to have this path in the include dir. BUG= Review URL: https://chromiumcodereview.appspot.com/10909176 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156064 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/compositor_bindings/compositor_bindings.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 0cdc938..a589025 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -61,6 +61,7 @@
],
'include_dirs': [
'../..',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(webkit_src_dir)/Source/Platform/chromium',
],
'conditions': [