Roll chromium_revision 8e72e1d..271c6cc (307131:309333)
This enables OpenSSL by default for Windows, see8e72e1d..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 of5c49978f09This should also fix Android test execution that started failing after https://codereview.chromium.org/815213002 was submitted, since it's based one2a338fac9Relevant 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:8e72e1d..271c6cc/DEPS Clang version updated 218707:223108: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
This commit is contained in:
@@ -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': {
|
||||
|
||||
Reference in New Issue
Block a user