Index: Source/core/core.gyp |
diff --git a/Source/core/core.gyp b/Source/core/core.gyp |
index 2b714177e7fe8abb50a2bfc003e362c3f579f88b..8e2420ee021ebda09fc3461fea0304d4b4c85dfc 100644 |
--- a/Source/core/core.gyp |
+++ b/Source/core/core.gyp |
@@ -45,7 +45,7 @@ |
'../..', |
'..', |
'<(SHARED_INTERMEDIATE_DIR)/blink', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings', |
+ '<(bindings_output_dir)', |
], |
'conditions': [ |
@@ -197,7 +197,7 @@ |
'target_name': 'debugger_script_source', |
'type': 'none', |
'variables': { |
- 'input_file_path': '<(bindings_dir)/v8/DebuggerScript.js', |
+ 'input_file_path': '<(bindings_v8_dir)/DebuggerScript.js', |
'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/blink/DebuggerScriptSource.h', |
'character_array_name': 'DebuggerScriptSource_js', |
}, |
@@ -209,7 +209,6 @@ |
'hard_dependency': 1, |
'dependencies': [ |
'webcore_prerequisites', |
- '../bindings/generated_bindings.gyp:generated_bindings', |
'core_generated.gyp:make_core_generated', |
'inspector_overlay_page', |
'inspector_protocol_sources', |
@@ -217,6 +216,7 @@ |
'injected_canvas_script_source', |
'injected_script_source', |
'debugger_script_source', |
+ '../bindings/generated_bindings.gyp:generated_bindings', |
'../platform/platform_generated.gyp:make_platform_generated', |
'../wtf/wtf.gyp:wtf', |
'<(DEPTH)/gin/gin.gyp:gin', |
@@ -234,12 +234,12 @@ |
], |
'include_dirs': [ |
'<(SHARED_INTERMEDIATE_DIR)/blink', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings', |
+ '<(bindings_output_dir)', |
'<@(webcore_include_dirs)', |
# FIXME: Remove these once the bindings script generates qualified |
# includes for these correctly. (Sequences don't work yet.) |
- '<(bindings_dir)/v8/custom', |
+ '<(bindings_v8_dir)/custom', |
'html', |
'html/shadow', |
'inspector', |
@@ -808,32 +808,32 @@ |
'INSIDE_BLINK', |
], |
'include_dirs': [ |
- '<(bindings_dir)/v8', # FIXME: Remove once http://crbug.com/236119 is fixed. |
+ '<(bindings_v8_dir)', # FIXME: Remove once http://crbug.com/236119 is fixed. |
'testing', |
'testing/v8', |
], |
'sources': [ |
'<@(webcore_testing_files)', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8GCObservation.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8GCObservation.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8MallocStatistics.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8MallocStatistics.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8TypeConversions.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8TypeConversions.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8Internals.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8Internals.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalProfilers.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalProfilers.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalSettings.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalSettings.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalSettingsGenerated.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalSettingsGenerated.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalRuntimeFlags.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8InternalRuntimeFlags.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', |
- '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', |
+ '<(bindings_output_dir)/V8GCObservation.cpp', |
+ '<(bindings_output_dir)/V8GCObservation.h', |
+ '<(bindings_output_dir)/V8MallocStatistics.cpp', |
+ '<(bindings_output_dir)/V8MallocStatistics.h', |
+ '<(bindings_output_dir)/V8TypeConversions.cpp', |
+ '<(bindings_output_dir)/V8TypeConversions.h', |
+ '<(bindings_output_dir)/V8Internals.cpp', |
+ '<(bindings_output_dir)/V8Internals.h', |
+ '<(bindings_output_dir)/V8InternalProfilers.cpp', |
+ '<(bindings_output_dir)/V8InternalProfilers.h', |
+ '<(bindings_output_dir)/V8InternalSettings.cpp', |
+ '<(bindings_output_dir)/V8InternalSettings.h', |
+ '<(bindings_output_dir)/V8InternalSettingsGenerated.cpp', |
+ '<(bindings_output_dir)/V8InternalSettingsGenerated.h', |
+ '<(bindings_output_dir)/V8InternalRuntimeFlags.cpp', |
+ '<(bindings_output_dir)/V8InternalRuntimeFlags.h', |
+ '<(bindings_output_dir)/V8LayerRect.cpp', |
+ '<(bindings_output_dir)/V8LayerRect.h', |
+ '<(bindings_output_dir)/V8LayerRectList.cpp', |
+ '<(bindings_output_dir)/V8LayerRectList.h', |
], |
'sources/': [ |
['exclude', 'testing/js'], |