aboutsummaryrefslogtreecommitdiff
path: root/setup_links.py
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2015-01-06 07:24:27 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org>2015-01-06 07:24:27 +0000
commitcbe7ca8796a3e0c6b56910640e76943ba4224118 (patch)
tree59323aa6085b8521d318ebe8cf2df4aa68cfca56 /setup_links.py
parent3a63a3c35d93616606c23d27583b83a198b94a3e (diff)
downloadwebrtc-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 'setup_links.py')
-rwxr-xr-xsetup_links.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/setup_links.py b/setup_links.py
index 58912702c8..da371458ed 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -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'
]