[backport] M53: gn: Remove unnecessary v8 defaults

Original commit: Remove chromium defaults for v8_optimized_debug and v8_use_external_startup_data. This is not needed after v8 provides these defaults: https://codereview.chromium.org/2025803003/ https://codereview.chromium.org/2024833002/ It also interferes if somebody tries to override the gn args with a different value. BUG=chromium:616034 [email protected], [email protected] Committed: https://crrev.com/0fffeb2adaa3c284b760922c1aecce1516b998ce Review-Url: https://codereview.chromium.org/2058033002 Cr-Original-Commit-Position: refs/heads/master@{#406067} Cr-Commit-Position: refs/heads/master@{#407106}
crosswalk-project · Aug 31, 2016 · d7a7830 · d7a7830
1 parent 2a4ffcb
commit d7a7830
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -16,6 +16,8 @@ import("//build_overrides/v8.gni")
 import("//media/media_options.gni")
 import("//third_party/openh264/openh264_args.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
+import("//v8/gni/v8.gni")
+import("//v8/snapshot_toolchain.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")

diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
@@ -9,11 +9,6 @@ if (is_android) {
 # TODO(sky): nuke this. Temporary while sorting out http://crbug.com/465456.
 enable_correct_v8_arch = false
 
-v8_use_external_startup_data = !is_ios
-
-# Turns on compiler optimizations in V8 in Debug build.
-v8_optimized_debug = true
-
 # V8 extras
 # Adding V8 extras files requires API owners review
 # Be sure to synchronize with build/common.gypi

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -15,6 +15,7 @@ import("//chrome/chrome_repack_locales.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
 import("//ui/base/ui_features.gni")
+import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")

diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
@@ -6,11 +6,11 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/visual_studio_version.gni")
-import("//build_overrides/v8.gni")
 import("//chrome/test/mini_installer/mini_installer_test.gni")
 import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("//ui/base/ui_features.gni")
+import("//v8/gni/v8.gni")
 
 config("mini_installer_compiler_flags") {
   # Disable buffer security checking.

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -11,6 +11,7 @@ import("//chrome/chrome_tests.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
+import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")

diff --git a/chrome/test/base/js2gtest.gni b/chrome/test/base/js2gtest.gni
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/v8.gni")
+import("//v8/gni/v8.gni")
 import("//v8/snapshot_toolchain.gni")
 
 # Variables:

diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
@@ -6,12 +6,12 @@ import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
-import("//build_overrides/v8.gni")
 import("//chromecast/build/tests/cast_test.gni")
 import("//chromecast/chromecast.gni")
 import("//media/media_options.gni")
 import("//tools/grit/repack.gni")
 import("//ui/ozone/ozone.gni")
+import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")

diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
@@ -15,8 +15,10 @@ if (is_android) {
   import("//build/config/android/config.gni")
 } else if (is_mac) {
   import("//build/config/mac/rules.gni")
-  import("//build_overrides/v8.gni")
   import("//build/mac/tweak_info_plist.gni")
+  import("//v8/gni/v8.gni")
+} else if (is_win) {
+  import("//build/win/syzygy/syzygy.gni")
 }
 
 declare_args() {

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -7,10 +7,10 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//build_overrides/v8.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
+import("//v8/gni/v8.gni")
 
 content_tests_gypi_values =
     exec_script("//build/gypi_to_gn.py",

diff --git a/gin/BUILD.gn b/gin/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/v8.gni")
 import("//testing/test.gni")
+import("//v8/gni/v8.gni")
 
 component("gin") {
   sources = [

diff --git a/net/BUILD.gn b/net/BUILD.gn
@@ -8,13 +8,13 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//build_overrides/v8.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//tools/grit/grit_rule.gni")
 import("//url/features.gni")
+import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")