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 a7ffca8f859f4565590b1402f109cf440fa6bf87..9a9f01a73a9e065c16b31c65521671edb41006b4 100644 |
--- a/third_party/WebKit/Source/modules/modules.gni |
+++ b/third_party/WebKit/Source/modules/modules.gni |
@@ -4,35 +4,16 @@ |
import("//third_party/WebKit/Source/config.gni") |
-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", |
+ "--replace=<(blink_modules_output_dir)=$root_gen_dir/blink/modules", |
], |
"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)" ] |
-modules_idl_files = get_path_info(_tmp_modules_idl_files, "abspath") |
- |
-modules_dictionary_idl_files = |
- 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") |
- |
-modules_event_idl_files = |
- 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") |
@@ -52,10 +33,6 @@ 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") |
- |
# Defines a part of blink modules. This is either a source set or a static |
# library with defaults for commonly-used values. |
# |