Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/build_overrides/gtest.gni b/build_overrides/gtest.gni
new file mode 100644
index 0000000..5d22f01
--- /dev/null
+++ b/build_overrides/gtest.gni
@@ -0,0 +1,15 @@
+# Copyright 2016 The V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Exclude support for registering main function in multi-process tests.
+gtest_include_multiprocess = false
+
+# Exclude support for platform-specific operations across unit tests.
+gtest_include_platform_test = true
+
+# Exclude support for testing Objective C code on OS X and iOS.
+gtest_include_objc_support = true
+
+# Exclude support for flushing coverage files on iOS.
+gtest_include_ios_coverage = true
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
index 656045b..5dcd672 100644
--- a/build_overrides/v8.gni
+++ b/build_overrides/v8.gni
@@ -4,26 +4,23 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
+import("//build/config/v8_target_cpu.gni")
+import("//gni/v8.gni")
if (is_android) {
import("//build/config/android/config.gni")
}
-declare_args() {
- # V8 generates code for this architecture.
- v8_target_arch = target_cpu
-}
-
-if (((v8_target_arch == "ia32" ||
- v8_target_arch == "x64" ||
- v8_target_arch=="x87") &&
+if (((v8_target_cpu == "x86" ||
+ v8_target_cpu == "x64" ||
+ v8_target_cpu=="x87") &&
(is_linux || is_mac)) ||
- (v8_target_arch == "ppc64" && is_linux)) {
+ (v8_target_cpu == "ppc64" && is_linux)) {
v8_enable_gdbjit = true
}
-icu_use_data_file_flag = false
v8_imminent_deprecation_warnings = true
-v8_optimized_debug = false
-v8_extra_library_files = []
-v8_experimental_extra_library_files = []
+
+# Add simple extras solely for the purpose of the cctests.
+v8_extra_library_files = [ "//test/cctest/test-extra.js" ]
+v8_experimental_extra_library_files = [ "//test/cctest/test-experimental-extra.js" ]