Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Id3e5fc241d238b5648d8202304515911b565d457
diff --git a/Source/bindings/core/v8/generated.gypi b/Source/bindings/core/v8/generated.gypi
index 00a0690..a599286 100644
--- a/Source/bindings/core/v8/generated.gypi
+++ b/Source/bindings/core/v8/generated.gypi
@@ -3,21 +3,18 @@
# found in the LICENSE file.
{
- 'includes': [
- '../../bindings.gypi',
- ],
'variables': {
- 'bindings_core_v8_output_dir': '<(bindings_output_dir)/core/v8',
+ 'bindings_core_v8_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/core/v8',
'conditions': [
['OS=="win" and buildtype=="Official"', {
# On Windows Official release builds, we try to preserve symbol
# space.
- 'bindings_core_generated_aggregate_files': [
+ 'bindings_core_v8_generated_aggregate_files': [
'<(bindings_core_v8_output_dir)/V8GeneratedCoreBindings.cpp',
],
}, {
- 'bindings_core_generated_aggregate_files': [
+ 'bindings_core_v8_generated_aggregate_files': [
'<(bindings_core_v8_output_dir)/V8GeneratedCoreBindings01.cpp',
'<(bindings_core_v8_output_dir)/V8GeneratedCoreBindings02.cpp',
'<(bindings_core_v8_output_dir)/V8GeneratedCoreBindings03.cpp',