From 80381aac5c608edfe795dcc67f51406d320e39b1 Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 19 Apr 2016 22:59:34 -0700 Subject: [PATCH] Roll chromium_revision 61ed337cfe..21934f358a (388120:388405) Change log: https://chromium.googlesource.com/chromium/src/+log/61ed337cfe..21934f358a Full diff: https://chromium.googlesource.com/chromium/src/+/61ed337cfe..21934f358a No dependencies changed. No update to Clang. TBR= NOTRY=True Review URL: https://codereview.webrtc.org/1901763005 Cr-Commit-Position: refs/heads/master@{#12434} --- DEPS | 2 +- build_overrides/gtest.gni | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 build_overrides/gtest.gni diff --git a/DEPS b/DEPS index 70f1380fd0..3ed9fb24ce 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '61ed337cfe003bbc8f6619f644e90f95b1bcfd33', + 'chromium_revision': '21934f358a96ef3596d739d62b85520b6242ff65', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/build_overrides/gtest.gni b/build_overrides/gtest.gni new file mode 100644 index 0000000000..a64bb7ed5b --- /dev/null +++ b/build_overrides/gtest.gni @@ -0,0 +1,13 @@ +# Copyright (c) 2016 The WebRTC 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 in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# Include support for registering main function in multi-process tests. +gtest_include_multiprocess = true + +# Include support for platform-specific operations across unit tests. +gtest_include_platform_test = true