diff options
author | Ben Murdoch <benm@google.com> | 2017-03-08 14:04:23 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2017-03-13 15:00:19 +0000 |
commit | c8c1d9e03f4babd16833b0f8ccf6aab5fa6e8c7a (patch) | |
tree | 0626f6eea22bedac0b27890e0a710e790758a92d /gni | |
parent | 3ed978da7c05e4bc0a6b95033aeea85c7e480adf (diff) | |
download | v8-c8c1d9e03f4babd16833b0f8ccf6aab5fa6e8c7a.tar.gz |
Merge V8 5.6.326.50
Test: manual, ran D8, tested connecting through PAC proxy.
Change-Id: I6067097f8ded999e9930a7dfd2fdc3733d7c6284
Diffstat (limited to 'gni')
-rw-r--r-- | gni/isolate.gni | 25 | ||||
-rw-r--r-- | gni/v8.gni | 24 |
2 files changed, 41 insertions, 8 deletions
diff --git a/gni/isolate.gni b/gni/isolate.gni index 93c828d2..1cc3a387 100644 --- a/gni/isolate.gni +++ b/gni/isolate.gni @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/sanitizers/sanitizers.gni") +import("//build_overrides/v8.gni") import("//third_party/icu/config.gni") import("v8.gni") @@ -12,11 +13,21 @@ declare_args() { } template("v8_isolate_run") { + forward_variables_from(invoker, + "*", + [ + "deps", + "isolate", + ]) + # Remember target name as within the action scope the target name will be # different. name = target_name - if (name != "" && invoker.isolate != "" && invoker.deps != [] && - v8_test_isolation_mode != "noop") { + + assert(defined(invoker.deps)) + assert(defined(invoker.isolate)) + + if (name != "" && v8_test_isolation_mode != "noop") { action(name + "_run") { testonly = true @@ -86,6 +97,11 @@ template("v8_isolate_run") { } else { icu_use_data_file_flag = "0" } + if (v8_enable_inspector_override) { + enable_inspector = "1" + } else { + enable_inspector = "0" + } if (v8_use_external_startup_data) { use_external_startup_data = "1" } else { @@ -107,7 +123,6 @@ template("v8_isolate_run") { gcmole = "0" } - # Note, all paths will be rebased in isolate_driver.py to be relative to # the isolate file. args = [ @@ -142,6 +157,8 @@ template("v8_isolate_run") { "--config-variable", "icu_use_data_file_flag=$icu_use_data_file_flag", "--config-variable", + "is_gn=1", + "--config-variable", "msan=$msan", "--config-variable", "tsan=$tsan", @@ -154,6 +171,8 @@ template("v8_isolate_run") { "--config-variable", "target_arch=$target_arch", "--config-variable", + "v8_enable_inspector=$enable_inspector", + "--config-variable", "v8_use_external_startup_data=$use_external_startup_data", "--config-variable", "v8_use_snapshot=$use_snapshot", @@ -26,6 +26,10 @@ declare_args() { # Use external files for startup data blobs: # the JS builtins sources and the start snapshot. v8_use_external_startup_data = "" + + # Enable ECMAScript Internationalization API. Enabling this feature will + # add a dependency on the ICU library. + v8_enable_i18n_support = true } if (v8_use_external_startup_data == "") { @@ -38,15 +42,17 @@ if (v8_enable_backtrace == "") { v8_enable_backtrace = is_debug && !v8_optimized_debug } -############################################################################### -# Templates -# - # Points to // in v8 stand-alone or to //v8/ in chromium. We need absolute # paths for all configs in templates as they are shared in different # subdirectories. v8_path_prefix = get_path_info("../", "abspath") +v8_inspector_js_protocol = v8_path_prefix + "/src/inspector/js_protocol.json" + +############################################################################### +# Templates +# + # Common configs to remove or add in all v8 targets. v8_remove_configs = [ "//build/config/compiler:chromium_code" ] v8_add_configs = [ @@ -87,7 +93,15 @@ template("v8_source_set") { template("v8_executable") { executable(target_name) { - forward_variables_from(invoker, "*", [ "configs" ]) + forward_variables_from(invoker, + "*", + [ + "configs", + "remove_configs", + ]) + if (defined(invoker.remove_configs)) { + configs -= invoker.remove_configs + } configs += invoker.configs configs -= v8_remove_configs configs += v8_add_configs |