zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision f2d1e453de..cf1645bec7 (563863:563963)

Browse Source 
Change log: f2d1e453de..cf1645bec7
Full diff: f2d1e453de..cf1645bec7

Roll chromium third_party 02d962eb0e..1b4d922d36
Change log: 02d962eb0e..1b4d922d36

Changed dependencies:
* src/base: 0ecab11ffa..57de7ba6db
* src/build: 3c4efebb96..ea9199f1f4
* src/ios: 8e0b21f69f..c790da9b2a
* src/testing: 3ae9d12c9d..e10eefe10d
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b26b30dc08..54e864df3f
* src/third_party/depot_tools: 621fe6f9b5..88087bad47
* src/tools: c50cb3b65c..67b206d389
* src/tools/swarming_client: 3543e21830..281c390193
DEPS diff: f2d1e453de..cf1645bec7/DEPS

No update to Clang.

TBR=buildbot@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true

Change-Id: Ie2daa32df5131e1a11b6f01dbd574879ff000a5d
Reviewed-on: https://webrtc-review.googlesource.com/80773
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23500}
This commit is contained in:
Autoroller
2018-06-03 01:43:39 -07:00
committed by Commit Bot
parent 38eac97df0
commit 0c12d8d8c6
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
third_party/googletest/BUILD.gn vendored
View File

@ -97,6 +97,7 @@ source_set("gtest") {
configs += [ "//build/config/compiler:no_chromium_code" ]
defines = []
deps = []
if (is_nacl || !build_with_chromium) {
defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ]
sources -= [
@ -104,15 +105,14 @@ source_set("gtest") {
"custom/gtest/internal/custom/stack_trace_getter.h",
]
} else {
deps = [
"//base",
deps += [ "//base" ]
}
if (is_fuchsia) {
deps += [
"//third_party/fuchsia-sdk:fdio",
"//third_party/fuchsia-sdk:launchpad",
]
if (is_fuchsia) {
deps += [
"//third_party/fuchsia-sdk:fdio",
"//third_party/fuchsia-sdk:launchpad",
]
}
}
}