diff options
| author | Autoroller <buildbot@webrtc.org> | 2018-06-03 01:43:39 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-06-03 09:05:38 +0000 |
| commit | 0c12d8d8c614bcb6fb44c4e08d5d0f7f127a664c (patch) | |
| tree | 7b26585621746b2f58b701ae31097d0e27c54681 /third_party | |
| parent | 38eac97df017c202f75331f074e5777fca4d2cbe (diff) | |
| download | webrtc-0c12d8d8c614bcb6fb44c4e08d5d0f7f127a664c.tar.gz | |
Roll chromium_revision f2d1e453de..cf1645bec7 (563863:563963)
Change log: https://chromium.googlesource.com/chromium/src/+log/f2d1e453de..cf1645bec7
Full diff: https://chromium.googlesource.com/chromium/src/+/f2d1e453de..cf1645bec7
Roll chromium third_party 02d962eb0e..1b4d922d36
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/02d962eb0e..1b4d922d36
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/0ecab11ffa..57de7ba6db
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/3c4efebb96..ea9199f1f4
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/8e0b21f69f..c790da9b2a
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3ae9d12c9d..e10eefe10d
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b26b30dc08..54e864df3f
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/621fe6f9b5..88087bad47
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c50cb3b65c..67b206d389
* src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/3543e21830..281c390193
DEPS diff: https://chromium.googlesource.com/chromium/src/+/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}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/googletest/BUILD.gn | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 33e8307452..4b8720768e 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -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", - ] - } } } |