diff options
| author | davidben <davidben@chromium.org> | 2015-07-14 16:56:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 23:56:57 +0000 |
| commit | a4f7d7df73d96bd453b6c6a7f68f8de13f2b421b (patch) | |
| tree | 74e3e7e6510819b3b34ecc67c4e5b3b788fefb37 /chrome/installer/linux | |
| parent | 4f26898a89194d2ebe928b220180ca6f24450de7 (diff) | |
| download | chromium_src-a4f7d7df73d96bd453b6c6a7f68f8de13f2b421b.zip chromium_src-a4f7d7df73d96bd453b6c6a7f68f8de13f2b421b.tar.gz chromium_src-a4f7d7df73d96bd453b6c6a7f68f8de13f2b421b.tar.bz2 | |
Switch Linux and CrOS to BoringSSL.
This is a reland of https://codereview.chromium.org/1210073014/ with fixes to
Linux expected shared library dependencies per
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/2784/steps/compile/logs/stdio
On the dpkg side, the inferred minimum NSS version goes down because we no
longer use PK11_SignWithSymKey. (The actual version is still overwritten in
build.sh.)
On the rpm side, we no longer use any function from libplc4.so (there used to
be a PL_strdup call), so the linker prunes it.
If this causes problems, please revert first and ask questions
later.
BUG=462040
TBR=rsleevi@chromium.org,thakis@chromium.org
Review URL: https://codereview.chromium.org/1231723003
Cr-Commit-Position: refs/heads/master@{#338775}
Diffstat (limited to 'chrome/installer/linux')
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_ia32 | 2 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_x64 | 2 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_i386 | 1 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_x86_64 | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/chrome/installer/linux/debian/expected_deps_ia32 b/chrome/installer/linux/debian/expected_deps_ia32 index 8b7b6e2..fd62c5f 100644 --- a/chrome/installer/linux/debian/expected_deps_ia32 +++ b/chrome/installer/linux/debian/expected_deps_ia32 @@ -14,7 +14,7 @@ libgdk-pixbuf2.0-0 (>= 2.22.0) libglib2.0-0 (>= 2.26.0) libgtk2.0-0 (>= 2.24.0) libnspr4 (>= 1.8.0.10) -libnss3 (>= 3.14.3) +libnss3 (>= 3.12.4) libpango1.0-0 (>= 1.14.0) libstdc++6 (>= 4.6) libx11-6 (>= 2:1.4.99.1) diff --git a/chrome/installer/linux/debian/expected_deps_x64 b/chrome/installer/linux/debian/expected_deps_x64 index 8b7b6e2..fd62c5f 100644 --- a/chrome/installer/linux/debian/expected_deps_x64 +++ b/chrome/installer/linux/debian/expected_deps_x64 @@ -14,7 +14,7 @@ libgdk-pixbuf2.0-0 (>= 2.22.0) libglib2.0-0 (>= 2.26.0) libgtk2.0-0 (>= 2.24.0) libnspr4 (>= 1.8.0.10) -libnss3 (>= 3.14.3) +libnss3 (>= 3.12.4) libpango1.0-0 (>= 1.14.0) libstdc++6 (>= 4.6) libx11-6 (>= 2:1.4.99.1) diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 2875d40..4b6f41d 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -45,7 +45,6 @@ libnss3.so libnssutil3.so libpango-1.0.so.0 libpangocairo-1.0.so.0 -libplc4.so libpthread.so.0 libpthread.so.0(GLIBC_2.0) libpthread.so.0(GLIBC_2.1) diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index 9ffd93b..74f2920 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -38,7 +38,6 @@ libnss3.so()(64bit) libnssutil3.so()(64bit) libpango-1.0.so.0()(64bit) libpangocairo-1.0.so.0()(64bit) -libplc4.so()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libpthread.so.0(GLIBC_2.3.2)(64bit) |