Index: Source/bindings/core/v8/generated.gyp |
diff --git a/Source/bindings/core/v8/generated.gyp b/Source/bindings/core/v8/generated.gyp |
index 5fe17ec6e641078ee322225db124a99733cfc24a..52ba2840dcd9ddf66e0255397b05c6d46fe2c05b 100644 |
--- a/Source/bindings/core/v8/generated.gyp |
+++ b/Source/bindings/core/v8/generated.gyp |
@@ -13,6 +13,9 @@ |
# FIXME: need list of modules IDL files because some core IDL files depend |
# on modules IDL files http://crbug.com/358074 |
'../../modules/idl.gypi', |
+ # FIXME: need info about modules IDL files because some core IDL files |
+ # depend on modules IDL files http://crbug.com/358074 |
+ '../../modules/modules.gypi', |
'../../scripts/scripts.gypi', |
'../idl.gypi', |
'generated.gypi', |
@@ -50,15 +53,15 @@ |
'inputs': [ |
'<@(idl_lexer_parser_files)', # to be explicit (covered by parsetab) |
'<@(idl_compiler_files)', |
- '<(bindings_output_dir)/lextab.py', |
- '<(bindings_output_dir)/parsetab.pickle', |
- '<(bindings_output_dir)/cached_jinja_templates.stamp', |
+ '<(bindings_scripts_output_dir)/lextab.py', |
+ '<(bindings_scripts_output_dir)/parsetab.pickle', |
+ '<(bindings_scripts_output_dir)/cached_jinja_templates.stamp', |
'<(bindings_dir)/IDLExtendedAttributes.txt', |
# If the dependency structure or public interface info (e.g., |
# [ImplementedAs]) changes, we rebuild all files, since we're not |
# computing dependencies file-by-file in the build. |
# This data is generally stable. |
- '<(blink_output_dir)/InterfacesInfo.pickle', |
+ '<(bindings_modules_output_dir)/InterfacesInfoModules.pickle', |
# Further, if any dependency (partial interface or implemented |
# interface) changes, rebuild everything, since every IDL potentially |
# depends on them, because we're not computing dependencies |
@@ -70,8 +73,8 @@ |
'<@(all_dependency_idl_files)', |
], |
'outputs': [ |
- '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).cpp', |
- '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).h', |
+ '<(bindings_core_v8_output_dir)/V8<(RULE_INPUT_ROOT).cpp', |
+ '<(bindings_core_v8_output_dir)/V8<(RULE_INPUT_ROOT).h', |
], |
# sanitize-win-build-log.sed uses a regex which matches this command |
# line (Python script + .idl file being processed). |
@@ -80,10 +83,12 @@ |
'python', |
'-S', # skip 'import site' to speed up startup |
'<(bindings_scripts_dir)/idl_compiler.py', |
+ '--cache-dir', |
+ '<(bindings_scripts_output_dir)', |
'--output-dir', |
- '<(bindings_output_dir)', |
+ '<(bindings_core_v8_output_dir)', |
'--interfaces-info', |
- '<(blink_output_dir)/InterfacesInfo.pickle', |
+ '<(bindings_modules_output_dir)/InterfacesInfoModules.pickle', |
'--write-file-only-if-changed', |
'<(write_file_only_if_changed)', |
'<(RULE_INPUT_PATH)', |
@@ -107,6 +112,7 @@ |
'action': [ |
'python', |
'<(bindings_scripts_dir)/aggregate_generated_bindings.py', |
+ 'core', |
'<(core_idl_files_list)', |
'--', |
'<@(bindings_core_generated_aggregate_files)', |