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

Unified Diff: Source/bindings/derived_sources.gyp

Issue 29323008: Fix IDL dependency computation for partial interfaces (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reupload 4 Created 7 years, 2 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 | Source/bindings/scripts/generate_bindings.pl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/derived_sources.gyp
diff --git a/Source/bindings/derived_sources.gyp b/Source/bindings/derived_sources.gyp
index 9677e33d56bd508843b42d93cd6bc810c5ee0a11..b43829ca6ecf3abf1096e869de19b004f8024929 100644
--- a/Source/bindings/derived_sources.gyp
+++ b/Source/bindings/derived_sources.gyp
@@ -45,8 +45,7 @@
'support_idl_files': [
'<@(webcore_testing_support_idl_files)',
],
- 'testing_support_idl_files': [
- '<@(webcore_testing_support_idl_files)',
+ 'generated_support_idl_files': [
'<@(generated_webcore_testing_support_idl_files)',
],
'compiler_module_files': [
@@ -202,7 +201,8 @@
],
'sources': [
'<@(main_idl_files)',
- '<@(testing_support_idl_files)',
+ '<@(support_idl_files)',
+ '<@(generated_support_idl_files)',
],
'rules': [{
'rule_name': 'binding',
@@ -224,7 +224,7 @@
#
# If a new partial interface is added, need to regyp to update these
# dependencies, as these are computed statically at gyp runtime.
- '<!@pymod_do_main(list_idl_files_with_partial_interface <@(main_idl_files))',
+ '<!@pymod_do_main(list_idl_files_with_partial_interface <@(main_idl_files) <@(support_idl_files))',
# Generated IDLs are all partial interfaces, hence everything
# potentially depends on them.
'<@(generated_global_constructors_idl_files)',
@@ -264,7 +264,14 @@
'--interfaceDependenciesFile',
'<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
'--additionalIdlFiles',
- '<(testing_support_idl_files)',
+ # Generated IDL files aren't listed in InterfaceDependencies.txt,
+ # b/c they aren't available at GYP run time, so we need to sort them
+ # manually, depending on whether they are (main) interface files,
+ # for which we generate bindings, or dependencies, for which we don't.
+ # generated_support_idl_files are main interfaces, so generate
+ # bindings, but generated_global_constructors_idl_files are all
+ # partial interfaces, so don't (b/c generated by dependents).
+ '<(generated_support_idl_files)',
'<@(preprocessor)',
'<@(write_file_only_if_changed)',
'<(RULE_INPUT_PATH)',
« no previous file with comments | « no previous file | Source/bindings/scripts/generate_bindings.pl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698