summaryrefslogtreecommitdiffstats
path: root/chrome/installer/linux
diff options
context:
space:
mode:
authormail <mail@joachim-bauch.de>2015-05-15 14:59:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 21:59:59 +0000
commitc6d10bdd0fee0aee8aa6143c8501c6c382704b9b (patch)
treef71776aa36d4357d478a20323833b2f6c3fdbf9b /chrome/installer/linux
parenta0a825ff6e71576850e25a2a7e8db4fb32d671a6 (diff)
downloadchromium_src-c6d10bdd0fee0aee8aa6143c8501c6c382704b9b.zip
chromium_src-c6d10bdd0fee0aee8aa6143c8501c6c382704b9b.tar.gz
chromium_src-c6d10bdd0fee0aee8aa6143c8501c6c382704b9b.tar.bz2
Reland: Roll src/third_party/libsrtp 6446144:9c53f85 (svn 292694:295151)
This updates libsrtp to 1.5.2 and uses the OpenSSL/BoringSSL crypto code. See https://codereview.chromium.org/889083003/ and https://codereview.chromium.org/1098043003/ Summary of changes available at: https://chromium.googlesource.com/chromium/deps/libsrtp/+log/6446144..9c53f85 This previously landed in https://codereview.chromium.org/1130413005/ but got reverted in https://codereview.chromium.org/1139233002/ as it broke the Chrome Linux x64 builds due to a added dependency to "libgcc_s.so.1(GCC_3.0)(64bit)". The dependency was already allowed for 32bit, so it is allowed for 64bit now, too. BUG=328475 Review URL: https://codereview.chromium.org/1144623002 Cr-Commit-Position: refs/heads/master@{#330209}
Diffstat (limited to 'chrome/installer/linux')
-rw-r--r--chrome/installer/linux/rpm/expected_deps_x86_641
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
index 1b5cd37..f7085e2 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -20,6 +20,7 @@ libexpat.so.1()(64bit)
libfontconfig.so.1()(64bit)
libfreetype.so.6()(64bit)
libgcc_s.so.1()(64bit)
+libgcc_s.so.1(GCC_3.0)(64bit)
libgcc_s.so.1(GCC_4.0.0)(64bit)
libgconf-2.so.4()(64bit)
libgdk_pixbuf-2.0.so.0()(64bit)