| Index: third_party/WebKit/Source/modules/modules.gni
|
| diff --git a/third_party/WebKit/Source/modules/modules.gni b/third_party/WebKit/Source/modules/modules.gni
|
| index d6cb0e6d31e056c09f10db88d41a0d629a803167..d4230920698a4cba52d49f954eef8b4d9f439266 100644
|
| --- a/third_party/WebKit/Source/modules/modules.gni
|
| +++ b/third_party/WebKit/Source/modules/modules.gni
|
| @@ -7,37 +7,38 @@
|
| blink_modules_output_dir = "$root_gen_dir/blink/modules"
|
|
|
| _gypi = exec_script(
|
| - "//build/gypi_to_gn.py",
|
| - [ rebase_path("modules.gypi"),
|
| - "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
|
| - "--replace=<(blink_modules_output_dir)=$blink_modules_output_dir" ],
|
| - "scope",
|
| - [ "modules.gypi" ])
|
| + "//build/gypi_to_gn.py",
|
| + [
|
| + rebase_path("modules.gypi"),
|
| + "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
|
| + "--replace=<(blink_modules_output_dir)=$blink_modules_output_dir",
|
| + ],
|
| + "scope",
|
| + [ "modules.gypi" ])
|
|
|
| _tmp_modules_idl_files = _gypi.modules_idl_files
|
| +
|
| # modules_idl_files has a magic variable in it that is an embedder hook,
|
| # remove that since it's not a file (need to do this before rebasing).
|
| -_tmp_modules_idl_files -= [
|
| - "<@(extra_blink_module_idl_files)",
|
| -]
|
| +_tmp_modules_idl_files -= [ "<@(extra_blink_module_idl_files)" ]
|
| modules_idl_files = get_path_info(_tmp_modules_idl_files, "abspath")
|
|
|
| modules_dictionary_idl_files =
|
| - get_path_info(_gypi.modules_dictionary_idl_files, "abspath")
|
| + get_path_info(_gypi.modules_dictionary_idl_files, "abspath")
|
|
|
| # 'partial interface' or target (right side of) 'implements'
|
| modules_dependency_idl_files =
|
| - get_path_info(_gypi.modules_dependency_idl_files, "abspath")
|
| + get_path_info(_gypi.modules_dependency_idl_files, "abspath")
|
|
|
| modules_event_idl_files =
|
| - get_path_info(_gypi.modules_event_idl_files, "abspath")
|
| + get_path_info(_gypi.modules_event_idl_files, "abspath")
|
|
|
| # interfaces that inherit from Event
|
| generated_modules_files =
|
| - get_path_info(_gypi.generated_modules_files, "abspath")
|
| + get_path_info(_gypi.generated_modules_files, "abspath")
|
|
|
| generated_modules_dictionary_files =
|
| - get_path_info(_gypi.generated_modules_dictionary_files, "abspath")
|
| + get_path_info(_gypi.generated_modules_dictionary_files, "abspath")
|
|
|
| # Remove GYP variables from the list (need to do this before rebasing).
|
| _tmp_modules_files = _gypi.modules_files
|
| @@ -47,12 +48,13 @@ _tmp_modules_files -= [
|
| "<@(generated_modules_files)",
|
| ]
|
| modules_files = get_path_info(_tmp_modules_files, "abspath")
|
| +
|
| # Account for GYP var expansion.
|
| modules_files += generated_modules_files + generated_modules_dictionary_files
|
|
|
| # 'partial interface' or target (right side of) 'implements'
|
| modules_testing_dependency_idl_files =
|
| - get_path_info(_gypi.modules_testing_dependency_idl_files, "abspath")
|
| + get_path_info(_gypi.modules_testing_dependency_idl_files, "abspath")
|
|
|
| modules_testing_files = get_path_info(_gypi.modules_testing_files, "abspath")
|
| modules_unittest_files = get_path_info(_gypi.modules_unittest_files, "abspath")
|
|
|