AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Update V8 DEPS.

Browse Source 
Rolling v8/build: 6ae4520..c4de990

Rolling v8/buildtools: 10d701f..e8aa02e

Rolling v8/third_party/catapult: https://chromium.googlesource.com/catapult/+log/1e3e74d..b5c70ce

Rolling v8/third_party/googletest/src: a325ad2..7e5f90d

This also ports:
https://chromium-review.googlesource.com/c/chromium/src/+/1002612

TBR=machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org

Change-Id: I24b44acfb898e476df5701860e41a39352081f6d
Reviewed-on: https://chromium-review.googlesource.com/1004035
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: v8 autoroll <v8-autoroll@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52503}
This commit is contained in:
Michael Achenbach 2018-04-10 09:19:56 +02:00 committed by Commit Bot
parent 813106ad30
commit 9c6b7dc80b
3 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -12,7 +12,7 @@ vars = {
deps = {
'v8/build':
Var('chromium_url') + '/chromium/src/build.git' + '@' + '6ae4520a1aa12032abf50fd3438a94417151dfe6',
Var('chromium_url') + '/chromium/src/build.git' + '@' + 'c4de99078432abb75a66fbe0df90326ea0841702',
'v8/tools/gyp':
Var('chromium_url') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'v8/third_party/icu':
@ -20,7 +20,7 @@ deps = {
'v8/third_party/instrumented_libraries':
Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + '323cf32193caecbf074d1a0cb5b02b905f163e0f',
'v8/buildtools':
Var('chromium_url') + '/chromium/buildtools.git' + '@' + '10d701fce52d192005512aa832dc82f9aae72b5d',
Var('chromium_url') + '/chromium/buildtools.git' + '@' + 'e8aa02ea839e087f2db66100d02c3b5d47993852',
'v8/base/trace_event/common':
Var('chromium_url') + '/chromium/src/base/trace_event/common.git' + '@' + '211b3ed9d0481b4caddbee1322321b86a483ca1f',
'v8/third_party/android_ndk': {
@ -32,7 +32,7 @@ deps = {
'condition': 'checkout_android',
},
'v8/third_party/catapult': {
'url': Var('chromium_url') + '/catapult.git' + '@' + '1e3e74d24d376ac138d03d203c6e71b26da00935',
'url': Var('chromium_url') + '/catapult.git' + '@' + 'b5c70ce2580e8efd7c263a9d50123907e2cb62e7',
'condition': 'checkout_android',
},
'v8/third_party/colorama/src': {
@ -40,7 +40,7 @@ deps = {
'condition': 'checkout_android',
},
'v8/third_party/googletest/src':
Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + 'a325ad2db5deb623eab740527e559b81c0f39d65',
Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '7e5f90d3780d553cb86771141fb81349f3a63508',
'v8/third_party/jinja2':
Var('chromium_url') + '/chromium/src/third_party/jinja2.git' + '@' + '45571de473282bd1d8b63a8dfcb1fd268d0635d2',
'v8/third_party/markupsafe':

20
third_party/googletest/BUILD.gn vendored
View File

@ -14,17 +14,18 @@ config("gtest_config") {
# In order to allow regex matches in gtest to be shared between Windows
# and other systems, we tell gtest to always use its internal engine.
"GTEST_HAS_POSIX_RE=0",
"GTEST_LANG_CXX11=1",
# ::testing::Combine, which is heavily used in Chromium, is gated on
# tr1::tuple. Upstream avoids using tr1::tuple on Visual Studio 2017+,
# because it causes warnings. We'll take (and ignore) the warnings to keep
# our ::testing::Combine.
"GTEST_HAS_TR1_TUPLE=1",
"GTEST_LANG_CXX11=1",
"GTEST_HAS_STD_TUPLE=1",
]
# Gtest headers need to be able to find themselves.
include_dirs = [ "src/googletest/include" ]
include_dirs = [
# TODO(crbug.com/829773): Remove this after transitioning off <tr1/tuple>.
"custom",
"src/googletest/include",
]
if (is_win) {
cflags = [ "/wd4800" ] # Unused variable warning.
@ -34,7 +35,8 @@ config("gtest_config") {
config("gmock_config") {
# Gmock headers need to be able to find themselves.
include_dirs = [
"custom",
# TODO(crbug.com/829773): Add "custom" here after transitioning off
# <tr1/tuple>.
"src/googlemock/include",
]
}
@ -44,6 +46,8 @@ config("gmock_config") {
source_set("gtest") {
testonly = true
sources = [
# TODO(crbug.com/829773): Remove this after transitioning off <tr1/tuple>.
"custom/gmock/internal/custom/gmock-port.h",
"src/googletest/include/gtest/gtest-death-test.h",
"src/googletest/include/gtest/gtest-message.h",
"src/googletest/include/gtest/gtest-param-test.h",

27
third_party/googletest/custom/gtest/internal/custom/gtest-port.h vendored Normal file
View File

@ -0,0 +1,27 @@
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
#define THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
// This temporarily forwards tuple and some tuple functions from std::tr1 to
// std:: to make it possible to migrate from std::tr1.
//
// TODO(crbug.com/829773): Remove this file when the transition is complete.
#include <tuple>
namespace std {
namespace tr1 {
using std::get;
using std::make_tuple;
using std::tuple;
} // namespace tr1
} // namespace std
#endif // THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_