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 of5c49978f09
This should also fix Android test execution that started failing after https://codereview.chromium.org/815213002 was submitted, since it's based one2a338fac9
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: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:
parent
3a63a3c35d
commit
cbe7ca8796
2
.gitignore
vendored
2
.gitignore
vendored
@ -59,6 +59,7 @@
|
||||
/third_party/WebKit/Tools/Scripts
|
||||
/third_party/android_testrunner
|
||||
/third_party/android_tools
|
||||
/third_party/appurify-python
|
||||
/third_party/asan
|
||||
/third_party/ashmem
|
||||
/third_party/binutils
|
||||
@ -98,6 +99,7 @@
|
||||
/third_party/openmax_dl
|
||||
/third_party/opus
|
||||
/third_party/protobuf
|
||||
/third_party/requests
|
||||
/third_party/sqlite
|
||||
/third_party/syzygy
|
||||
/third_party/usrsctp
|
||||
|
2
DEPS
2
DEPS
@ -6,7 +6,7 @@
|
||||
vars = {
|
||||
'extra_gyp_flag': '-Dextra_gyp_flag=0',
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
'chromium_revision': '8e72e1d6c13fa6a4cf2859ac6e209be4546bb50d',
|
||||
'chromium_revision': '271c6cca48a6cef32c0f3add3b17b700707deec5',
|
||||
}
|
||||
|
||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
||||
|
@ -82,11 +82,13 @@ if 'android' in get_target_os_list():
|
||||
'base',
|
||||
'third_party/android_testrunner',
|
||||
'third_party/android_tools',
|
||||
'third_party/appurify-python',
|
||||
'third_party/ashmem',
|
||||
'third_party/jsr-305',
|
||||
'third_party/libevent',
|
||||
'third_party/libxml',
|
||||
'third_party/modp_b64',
|
||||
'third_party/requests',
|
||||
'tools/android',
|
||||
'tools/relocation_packer'
|
||||
]
|
||||
|
@ -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': {
|
||||
|
Loading…
x
Reference in New Issue
Block a user