Index: Source/modules/modules.gni |
diff --git a/Source/modules/modules.gni b/Source/modules/modules.gni |
index 87f14719d1097a24e5579e0945933d194c7a9747..1a3c784c1272b258216ec16042a09c0cb50f5a54 100644 |
--- a/Source/modules/modules.gni |
+++ b/Source/modules/modules.gni |
@@ -17,17 +17,18 @@ _tmp_modules_idl_files = _gypi.modules_idl_files |
_tmp_modules_idl_files -= [ |
"<@(extra_blink_module_idl_files)", |
] |
-modules_idl_files = rebase_path(_tmp_modules_idl_files, "//") |
+modules_idl_files = get_path_info(_tmp_modules_idl_files, "abspath") |
# 'partial interface' or target (right side of) 'implements' |
modules_dependency_idl_files = |
- rebase_path(_gypi.modules_dependency_idl_files, "//") |
+ get_path_info(_gypi.modules_dependency_idl_files, "abspath") |
-# Relative to the modules directory. |
-modules_event_idl_files = _gypi.modules_event_idl_files |
+modules_event_idl_files = |
+ get_path_info(_gypi.modules_event_idl_files, "abspath") |
# interfaces that inherit from Event |
-generated_modules_files = rebase_path(_gypi.generated_modules_files, "//") |
+generated_modules_files = |
+ get_path_info(_gypi.generated_modules_files, "abspath") |
# Remove GYP variables from the list (need to do this before rebasing). |
_tmp_modules_files = _gypi.modules_files |
@@ -35,13 +36,14 @@ _tmp_modules_files -= [ |
"<@(extra_blink_module_files)", |
"<@(generated_modules_files)", |
] |
-modules_files = rebase_path(_tmp_modules_files, "//") |
+modules_files = get_path_info(_tmp_modules_files, "abspath") |
modules_files += generated_modules_files # Account for GYP var expansion. |
# 'partial interface' or target (right side of) 'implements' |
modules_testing_dependency_idl_files = |
- rebase_path(_gypi.modules_testing_dependency_idl_files, "//") |
+ get_path_info(_gypi.modules_testing_dependency_idl_files, "abspath") |
-# Relative to the modules dir. |
-modules_testing_files = _gypi.modules_testing_files |
-modules_unittest_files = _gypi.modules_unittest_files |
+modules_testing_files = get_path_info(_gypi.modules_testing_files, "abspath") |
+modules_unittest_files = get_path_info(_gypi.modules_unittest_files, "abspath") |
+ |
+blink_modules_output_dir = "$root_gen_dir/blink/modules" |