Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Unified Diff: webkit/support/setup_third_party.gyp

Issue 12224087: fix third_party_headers to work properly on Windows w/ ninja. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update w/ review feedback, include <(DEPTH) into include_dirs Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/support/setup_third_party.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/setup_third_party.gyp
diff --git a/webkit/support/setup_third_party.gyp b/webkit/support/setup_third_party.gyp
index 7fc15ac9647091def3335e3c35ee6f50282a7c0f..bda14c2e4d0ae52b30b842b0709673b1201af851 100644
--- a/webkit/support/setup_third_party.gyp
+++ b/webkit/support/setup_third_party.gyp
@@ -11,11 +11,23 @@
},
'targets': [
{
+ # This target is only invoked when we are building chromium inside
+ # of a WebKit checkout. In this case, we will have chromium files
+ # that include WebKit headers via third_party/WebKit/Source/... ;
+ # that directory doesn't exist in a chromium-inside-webkit
+ # checkout, and so we need to create sets of forwarding headers.
+ #
+ # In addition, we can hit limits on the include paths on windows
+ # with a regular forwarding header due to the deep directory
+ # hierarchies, and so rather than using #includes that are relative
+ # to the directory containing the generated header, the generated files
+ # use #includes that are relative to <(DEPTH).
'target_name': 'third_party_headers',
'type': 'none',
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit',
+ '<(DEPTH)',
],
},
'actions': [
@@ -33,6 +45,7 @@
'setup_headers',
'<(DEPTH)/public',
'<(webkit_client_api_dest)',
+ '<(DEPTH)',
],
'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/chromium/public',
},
@@ -72,6 +85,7 @@
'setup_headers',
'<(DEPTH)/../mac/WebCoreSupport',
'<(mac_webcoresupport_dest)',
+ '<(DEPTH)',
],
'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/mac/WebCoreSupport',
},
« no previous file with comments | « no previous file | webkit/support/setup_third_party.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698