| Index: Source/bindings/bindings.gni
|
| diff --git a/Source/bindings/bindings.gni b/Source/bindings/bindings.gni
|
| index 3fd8f42bfe5a5acab168dcd455c7dd12d1bc182c..73b987df4f3218c539d354d6ac5b61bac8f07d33 100644
|
| --- a/Source/bindings/bindings.gni
|
| +++ b/Source/bindings/bindings.gni
|
| @@ -2,73 +2,50 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -# TODO(brettw) enable this to read the bindings sources (needs some work on the
|
| -# .gypi reading script).
|
| -#
|
| -_gypi = exec_script(
|
| +# All paths in this file should be absolute so it can be imported into
|
| +# different contexts.
|
| +
|
| +# v8/custom/custom.gypi --------------------------------------------------------
|
| +
|
| +# These paths are relative to v8/custom.
|
| +_v8_custom_gypi = exec_script(
|
| "//build/gypi_to_gn.py",
|
| - [ rebase_path("v8/v8.gypi"),
|
| - "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir" ],
|
| + [ rebase_path("v8/custom/custom.gypi") ],
|
| + "scope",
|
| + [ "v8/custom/custom.gypi" ])
|
| +
|
| +bindings_v8_custom_dir = get_path_info("v8/custom", "abspath")
|
| +bindings_v8_custom_files = get_path_info(
|
| + rebase_path(_v8_custom_gypi.bindings_v8_custom_files, ".",
|
| + bindings_v8_custom_dir),
|
| + "abspath")
|
| +
|
| +# v8/v8.gypi -------------------------------------------------------------------
|
| +
|
| +# These paths are relative to v8.
|
| +_v8_gypi = exec_script(
|
| + "//build/gypi_to_gn.py",
|
| + [ rebase_path("v8/v8.gypi") ],
|
| "scope",
|
| [ "v8/v8.gypi" ])
|
|
|
| -bindings_v8_dir = "//third_party/WebKit/Source/bindings/v8"
|
| -blink_output_dir = "$root_gen_dir/blink"
|
| -bindings_output_dir = "$blink_output_dir/bindings"
|
| +bindings_v8_dir = get_path_info("v8", "abspath")
|
| +
|
| +# v8.gypi references includes a reference to the custom_files list. Manually
|
| +# expand that.
|
| +_rel_bindings_v8_files = _v8_gypi.bindings_v8_files
|
| +_rel_bindings_v8_files -= [ "<@(bindings_v8_custom_files)" ]
|
| +bindings_v8_files = get_path_info(
|
| + rebase_path(_rel_bindings_v8_files, ".", "v8"),
|
| + "abspath")
|
| +bindings_v8_files += bindings_v8_custom_files
|
|
|
| -# Note: these are relative to the bindings/v8 directory.
|
| -bindings_v8_files = _gypi.bindings_v8_files
|
| -bindings_v8_unittest_files = _gypi.bindings_v8_unittest_files
|
| +# bindings.gypi ----------------------------------------------------------------
|
| +
|
| +bindings_dir = get_path_info(".", "abspath")
|
| +blink_output_dir = "$root_gen_dir/blink"
|
| +bindings_output_dir = "$root_gen_dir/blink/bindings"
|
|
|
| -if (is_win && is_official_build) {
|
| - # On Windows Official release builds, we try to preserve symbol space.
|
| - bindings_core_generated_aggregate_files = [
|
| - "$bindings_output_dir/V8GeneratedCoreBindings.cpp",
|
| - ]
|
| - bindings_modules_generated_aggregate_files = [
|
| - "$bindings_output_dir/V8GeneratedModulesBindings.cpp",
|
| - ]
|
| -} else {
|
| - bindings_core_generated_aggregate_files = [
|
| - "$bindings_output_dir/V8GeneratedCoreBindings01.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings02.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings03.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings04.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings05.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings06.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings07.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings08.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings09.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings10.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings11.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings12.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings13.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings14.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings15.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings16.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings17.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings18.cpp",
|
| - "$bindings_output_dir/V8GeneratedCoreBindings19.cpp",
|
| - ]
|
| - bindings_modules_generated_aggregate_files = [
|
| - "$bindings_output_dir/V8GeneratedModulesBindings01.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings02.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings03.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings04.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings05.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings06.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings07.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings08.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings09.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings10.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings11.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings12.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings13.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings14.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings15.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings16.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings17.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings18.cpp",
|
| - "$bindings_output_dir/V8GeneratedModulesBindings19.cpp",
|
| - ]
|
| -}
|
| +bindings_unittest_files = get_path_info(
|
| + rebase_path(_v8_gypi.bindings_v8_unittest_files, ".", bindings_v8_dir),
|
| + "abspath")
|
|
|