diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2015-01-06 07:24:27 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2015-01-06 07:24:27 +0000 |
| commit | cbe7ca8796a3e0c6b56910640e76943ba4224118 (patch) | |
| tree | 59323aa6085b8521d318ebe8cf2df4aa68cfca56 /talk | |
| parent | 3a63a3c35d93616606c23d27583b83a198b94a3e (diff) | |
| download | webrtc-cbe7ca8796a3e0c6b56910640e76943ba4224118.tar.gz | |
Roll chromium_revision 8e72e1d..271c6cc (307131:309333)
This enables OpenSSL by default for Windows, see
https://chromium.googlesource.com/chromium/src/+/8e72e1d..271c6cc/build/common.gypi
which required libjingle_tests.gyp to be updated since the
targets in third_party/nss/nss.gyp was moved into a condition in
https://codereview.chromium.org/694643002.
New Android dependencies are required due to being introduced in
build/android/pylib/remote/device/remote_device_test_run.py
of https://chromium.googlesource.com/chromium/src/+/5c49978f095340a59c62faaafe02a9527ec7728b
This should also fix Android test execution that started failing after
https://codereview.chromium.org/815213002 was submitted, since
it's based on https://chromium.googlesource.com/chromium/src/+/e2a338fac902ff391f761c67580b8de00d4adfdf
Relevant other changes:
* src/buildtools: 535aff2..23a4e2f
* src/third_party/android_tools: 4f723e2..8fe116f
* src/third_party/boringssl/src: 00505ec..306e520
* src/third_party/icu: 53ecf0f..51c1a4c
* src/third_party/libvpx: 9fbec81..d3f3dce
* src/tools/swarming_client: 1d4965c..119b084
Details: https://chromium.googlesource.com/chromium/src/+/8e72e1d..271c6cc/DEPS
Clang version updated 218707:223108:
https://chromium.googlesource.com/chromium/src/+/8e72e1d..271c6cc/tools/clang/scripts/update.sh
Due to this, we had to disable deadlock detection for TSan
due to a bug in Clang (see webrtc:
BUG=4106
R=pbos@webrtc.org, pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36459004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8003 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk')
| -rwxr-xr-x | talk/libjingle_tests.gyp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index ff120f3c23..ac13a4c548 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -126,10 +126,14 @@ ], 'conditions': [ ['OS=="win"', { - 'dependencies': [ - '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', - '<(DEPTH)/third_party/nss/nss.gyp:nspr', - '<(DEPTH)/third_party/nss/nss.gyp:nss', + 'conditions': [ + ['use_openssl==0', { + 'dependencies': [ + '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', + '<(DEPTH)/third_party/nss/nss.gyp:nspr', + '<(DEPTH)/third_party/nss/nss.gyp:nss', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { |