diff options
| author | Ben Murdoch <benm@google.com> | 2016-11-29 16:50:11 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2017-01-12 12:33:05 +0000 |
| commit | f91f0611dbaf29ca0f1d4aecb357ce243a19d2fa (patch) | |
| tree | d24b57d9c6d116ea509c621669f8ed7ed8658d3f /build_overrides | |
| parent | 28ba1faee73929922c84d2503d2467afa1fea3c3 (diff) | |
| download | v8-f91f0611dbaf29ca0f1d4aecb357ce243a19d2fa.tar.gz | |
Merge V8 5.4.500.40
Test: Manual - built & ran d8
Change-Id: I4edfa2853d3e565b729723645395688ece3193f4
Diffstat (limited to 'build_overrides')
| -rw-r--r-- | build_overrides/build.gni | 18 | ||||
| -rw-r--r-- | build_overrides/gtest.gni | 6 | ||||
| -rw-r--r-- | build_overrides/v8.gni | 12 |
3 files changed, 27 insertions, 9 deletions
diff --git a/build_overrides/build.gni b/build_overrides/build.gni new file mode 100644 index 00000000..da6d3e0d --- /dev/null +++ b/build_overrides/build.gni @@ -0,0 +1,18 @@ +# 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. + +mac_sdk_min_build_override = "10.10" +mac_deployment_target_build_override = "10.7" + +# Variable that can be used to support multiple build scenarios, like having +# Chromium specific targets in a client project's GN file etc. +build_with_chromium = false + +# Uncomment these to specify a different NDK location and version in +# non-Chromium builds. +# default_android_ndk_root = "//third_party/android_tools/ndk" +# default_android_ndk_version = "r10e" + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = false diff --git a/build_overrides/gtest.gni b/build_overrides/gtest.gni index 5d22f013..54c16b14 100644 --- a/build_overrides/gtest.gni +++ b/build_overrides/gtest.gni @@ -6,10 +6,10 @@ gtest_include_multiprocess = false # Exclude support for platform-specific operations across unit tests. -gtest_include_platform_test = true +gtest_include_platform_test = false # Exclude support for testing Objective C code on OS X and iOS. -gtest_include_objc_support = true +gtest_include_objc_support = false # Exclude support for flushing coverage files on iOS. -gtest_include_ios_coverage = true +gtest_include_ios_coverage = false diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni index 5dcd6725..fc4a70e5 100644 --- a/build_overrides/v8.gni +++ b/build_overrides/v8.gni @@ -11,15 +11,15 @@ if (is_android) { import("//build/config/android/config.gni") } -if (((v8_target_cpu == "x86" || - v8_target_cpu == "x64" || - v8_target_cpu=="x87") && +if (((v8_current_cpu == "x86" || + v8_current_cpu == "x64" || + v8_current_cpu=="x87") && (is_linux || is_mac)) || - (v8_target_cpu == "ppc64" && is_linux)) { - v8_enable_gdbjit = true + (v8_current_cpu == "ppc64" && is_linux)) { + v8_enable_gdbjit_default = true } -v8_imminent_deprecation_warnings = true +v8_imminent_deprecation_warnings_default = true # Add simple extras solely for the purpose of the cctests. v8_extra_library_files = [ "//test/cctest/test-extra.js" ] |