| Index: Source/bindings/scripts/scripts.gni
|
| diff --git a/Source/bindings/scripts/scripts.gni b/Source/bindings/scripts/scripts.gni
|
| index ae89f3aa5fdacc82cd6bfe5cefd2e87133c61b36..d6d6096d0d64a7f54c99890bb1f56ce8f3a043f1 100644
|
| --- a/Source/bindings/scripts/scripts.gni
|
| +++ b/Source/bindings/scripts/scripts.gni
|
| @@ -28,7 +28,7 @@ idl_compiler_files = get_path_info(_gypi.idl_compiler_files, "abspath")
|
| # sources_generated = list of generated IDL files to pass as inputs
|
| # component_dir = name if subdirectory (one word, no slashes) of component.
|
| # interfaces_info_file = output pickle file for interfaces info.
|
| -# component_wide_info_file = output pickle file for component wide info.
|
| +# component_info_file = output pickle file for component wide info.
|
| # deps = dependencies
|
| #
|
| # FIXME: Note the static/generated split is for consistency with GYP. This
|
| @@ -53,7 +53,7 @@ template("compute_interfaces_info_individual") {
|
|
|
| outputs = [
|
| invoker.interfaces_info_file,
|
| - invoker.component_wide_info_file,
|
| + invoker.component_info_file,
|
| ]
|
|
|
| args = [
|
| @@ -63,7 +63,7 @@ template("compute_interfaces_info_individual") {
|
| "--interfaces-info-file",
|
| rebase_path(invoker.interfaces_info_file, root_build_dir),
|
| "--component-info-file",
|
| - rebase_path(invoker.component_wide_info_file, root_build_dir),
|
| + rebase_path(invoker.component_info_file, root_build_dir),
|
| "--write-file-only-if-changed=1",
|
| "--",
|
| ] + rebase_path(invoker.sources_generated, root_build_dir)
|
| @@ -118,6 +118,8 @@ template("generate_event_interfaces") {
|
| # output_dir = string containing the directory to put the output files.
|
| # output_name_suffix = a suffix after the basename of the output file names.
|
| # target_component = component to generate code for.
|
| +# component_info = a filename of pickle file which contains component
|
| +# information
|
| template("idl_compiler") {
|
| output_dir = invoker.output_dir
|
| output_name_suffix = invoker.output_name_suffix
|
| @@ -165,6 +167,8 @@ template("idl_compiler") {
|
| "--interfaces-info",
|
| rebase_path("$bindings_modules_output_dir/InterfacesInfoOverall.pickle",
|
| root_build_dir),
|
| + "--component-info",
|
| + rebase_path(invoker.component_info, root_build_dir),
|
| "--write-file-only-if-changed=1", # Always true for Ninja.
|
| "--target-component",
|
| invoker.target_component,
|
| @@ -189,8 +193,8 @@ template("idl_compiler") {
|
| # sources = a list of IDL files to process
|
| # outputs = a list of files to write to
|
| # output_dir = the directory to put the output files
|
| -# component_wide_info = a filename of pickle file which contains component
|
| -# wide information
|
| +# component_info = a filename of pickle file which contains component
|
| +# information
|
| # target_component = component to generate code for
|
| template("idl_impl") {
|
| dictionary_impl_output_dir = "$root_gen_dir/blink/"
|
| @@ -214,7 +218,7 @@ template("idl_impl") {
|
| rebase_path("$bindings_modules_output_dir/InterfacesInfoOverall.pickle",
|
| root_build_dir),
|
| "--component-info",
|
| - rebase_path(invoker.component_wide_info, root_build_dir),
|
| + rebase_path(invoker.component_info, root_build_dir),
|
| "--target-component",
|
| invoker.target_component,
|
| "--write-file-only-if-changed=1",
|
|
|