Index: Source/platform/blink_platform.gyp |
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp |
index 8837077c2c343111a0c444d0a0f6e255284bf1f7..825dd77d71dc111ee02477da1cb26b9f3321bc4d 100644 |
--- a/Source/platform/blink_platform.gyp |
+++ b/Source/platform/blink_platform.gyp |
@@ -57,6 +57,11 @@ |
'BLINK_COMMON_IMPLEMENTATION=1', |
'INSIDE_BLINK', |
], |
+ 'include_dirs': [ |
+ # FIXME: Remove these once scripts generate qualified |
+ # includes correctly: http://crbug.com/380054 |
+ '<(blink_platform_output_dir)', |
+ ], |
'sources': [ |
'exported/WebCString.cpp', |
'exported/WebString.cpp', |
@@ -212,7 +217,7 @@ |
], |
'include_dirs': [ |
'<(angle_path)/include', |
- '<(SHARED_INTERMEDIATE_DIR)/blink', |
+ '<(blink_platform_output_dir)', |
], |
'xcode_settings': { |
# Some Mac-specific parts of WebKit won't compile without having this |
@@ -225,10 +230,10 @@ |
'<@(platform_heap_files)', |
# Additional .cpp files from platform_generated.gyp:make_platform_generated actions. |
- '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', |
+ '<(blink_platform_output_dir)/FontFamilyNames.cpp', |
+ '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp', |
+ '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h', |
+ '<(blink_platform_output_dir)/ColorData.cpp', |
], |
'sources/': [ |
# Exclude all platform specific things, reinclude them below on a per-platform basis |