Commit 805944fb authored by ynovikov's avatar ynovikov Committed by Commit Bot

Reland of Switch Chrome on Linux to libc++ (patchset #1 id:1 of...

Reland of Switch Chrome on Linux to libc++ (patchset #1 id:1 of https://codereview.chromium.org/2965693002/ )

Reason for revert:
ANGLE compilation issues should be fixed by https://chromium-review.googlesource.com/557679

Original issue's description:
> Revert of Switch Chrome on Linux to libc++ (patchset #5 id:180001 of https://codereview.chromium.org/2933573002/ )
>
> Reason for revert:
> Breaks https://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Linux%20Builder/builds/92009
>
> Original issue's description:
> > Switch Chrome on Linux to libc++
> >
> > Design doc detailing the changes at [1], and announcement to
> > chromium-dev at [2].
> >
> > In addition, this CL updates perf_expectations to increase the number
> > of allowed static initializers.  libc++ adds some initializers from
> > iostream.cpp.  However, this case is net-neutral since the initializer
> > used to live in libstdc++, but has been pushed into the chrome and
> > nacl executables.  The perf_expectations change also required adding
> > NOPRESUBMIT=true to silence a bogus warning.
> >
> > [1] https://docs.google.com/document/d/1zmHUXlpGNXB433wHnr40dLwj7c-USsIVlyAeH7vOI9o/edit#heading=h.bfky2xssferh
> > [2] https://groups.google.com/a/chromium.org/forum/?fromgroups#!topic/chromium-dev/z2YnFCxq0MA
> >
> > BUG=593874
> > R=thakis@chromium.org
> > TBR=rdevlin.cronin@chromium.org
> > CC=thestig@chromium.org
> > NOPRESUBMIT=true
> > CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_dbg_ng;master.tryserver.chromium.linux:linux_arm;master.tryserver.chromium.linux:linux_chromium_archive_rel_ng;master.tryserver.chromium.linux:linux_chromium_dbg_32_ng
> >
> > Review-Url: https://codereview.chromium.org/2933573002
> > Cr-Commit-Position: refs/heads/master@{#483498}
> > Committed: https://chromium.googlesource.com/chromium/src/+/39fcd6af4d8c9ddcf909b8d489c6ba684d046157
>
> TBR=thakis@chromium.org,rdevlin.cronin@chromium.org,thomasanderson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=593874
>
> Review-Url: https://codereview.chromium.org/2965693002
> Cr-Commit-Position: refs/heads/master@{#483560}
> Committed: https://chromium.googlesource.com/chromium/src/+/71911249cfd027e31384c7daa1a781773545036c

TBR=thakis@chromium.org,rdevlin.cronin@chromium.org,thomasanderson@chromium.org
BUG=593874
NOPRESUBMIT=true
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_dbg_ng;master.tryserver.chromium.linux:linux_arm;master.tryserver.chromium.linux:linux_chromium_archive_rel_ng;master.tryserver.chromium.linux:linux_chromium_dbg_32_ng;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2963223003
Cr-Commit-Position: refs/heads/master@{#483644}
parent 7777a152
......@@ -12,8 +12,12 @@ declare_args() {
# Use libc++ (buildtools/third_party/libc++ and
# buildtools/third_party/libc++abi) instead of stdlibc++ as standard
# library.
# TODO(thomasanderson): Clean up this complex condition. The
# is_tsan, is_msan, and (use_libfuzzer && !is_mac), clauses can be
# removed since they are only used on non-CrOs Linux. is_ubsan can
# probably also be removed for the same reason.
use_custom_libcxx =
(is_asan && is_linux && !is_chromeos &&
(!is_chromecast || is_cast_desktop_build)) || is_tsan || is_msan ||
is_ubsan || is_ubsan_security || (use_libfuzzer && !is_mac) || use_afl
(is_linux && !is_chromeos && (!is_chromecast || is_cast_desktop_build)) ||
is_tsan || is_msan || is_ubsan || is_ubsan_security ||
(use_libfuzzer && !is_mac) || use_afl
}
gconf-service
libasound2 (>= 1.0.16)
libatk1.0-0 (>= 1.12.4)
libc6 (>= 2.3.6-6~)
libc6 (>= 2.9)
libc6 (>= 2.18)
libcairo2 (>= 1.2.4)
libcups2 (>= 1.4.0)
libdbus-1-3 (>= 1.2.14)
......@@ -17,7 +16,6 @@ libnspr4 (>= 2:4.9-2~)
libnss3 (>= 2:3.13.4-2~)
libpango-1.0-0 (>= 1.14.0)
libpangocairo-1.0-0 (>= 1.14.0)
libstdc++6 (>= 4.8.1)
libx11-6 (>= 2:1.4.99.1)
libx11-xcb1
libxcb1 (>= 1.6)
......
gconf-service
libasound2 (>= 1.0.16)
libatk1.0-0 (>= 1.12.4)
libc6 (>= 2.15)
libc6 (>= 2.18)
libcairo2 (>= 1.6.0)
libcups2 (>= 1.4.0)
libdbus-1-3 (>= 1.2.14)
......@@ -16,7 +16,6 @@ libnspr4 (>= 2:4.9-2~)
libnss3 (>= 2:3.13.4-2~)
libpango-1.0-0 (>= 1.14.0)
libpangocairo-1.0-0 (>= 1.14.0)
libstdc++6 (>= 4.8.1)
libx11-6 (>= 2:1.4.99.1)
libx11-xcb1
libxcb1 (>= 1.6)
......
......@@ -90,7 +90,7 @@ do_package() {
fi
# Use find-requires script to make sure the dependencies are complete
# (especially libc and libstdc++ versions).
# (especially libc versions).
DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires)"
# Compare the expected dependency list to the generated list.
......@@ -127,8 +127,6 @@ do_package() {
# libssl3.so, force the dependency on libssl3 to ensure the NSS version is
# 3.28 or later, since libssl3 should always be packaged with libnss3.
#
# libstdc++.so.6 is for C++11 support.
#
# wget is for uploading crash reports with Breakpad.
#
# xdg-utils is still optional in LSB 4.0.
......@@ -149,7 +147,6 @@ do_package() {
DEPENDS="lsb >= 4.0, \
libnss3.so(NSS_3.22)${PKG_ARCH}, \
libssl3.so(NSS_3.28)${PKG_ARCH}, \
libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
wget, \
xdg-utils, \
zlib, \
......
......@@ -16,13 +16,14 @@ libXtst.so.6
libasound.so.2
libatk-1.0.so.0
libc.so.6
libc.so.6(GLIBC_2.0)
libc.so.6(GLIBC_2.1)
libc.so.6(GLIBC_2.1.3)
libc.so.6(GLIBC_2.2)
libc.so.6(GLIBC_2.2.3)
libc.so.6(GLIBC_2.11)
libc.so.6(GLIBC_2.14)
libc.so.6(GLIBC_2.15)
libc.so.6(GLIBC_2.18)
libc.so.6(GLIBC_2.2.5)
libc.so.6(GLIBC_2.3)
libc.so.6(GLIBC_2.3.2)
libc.so.6(GLIBC_2.3.3)
libc.so.6(GLIBC_2.3.4)
libc.so.6(GLIBC_2.4)
libc.so.6(GLIBC_2.6)
......@@ -37,7 +38,6 @@ libdl.so.2(GLIBC_2.1)
libexpat.so.1
libfontconfig.so.1
libgcc_s.so.1
libgcc_s.so.1(GCC_4.0.0)
libgcc_s.so.1(GLIBC_2.0)
libgconf-2.so.4
libgdk-x11-2.0.so.0
......@@ -65,12 +65,4 @@ libpthread.so.0(GLIBC_2.3.3)
librt.so.1
librt.so.1(GLIBC_2.2)
libsmime3.so
libstdc++.so.6
libstdc++.so.6(GLIBCXX_3.4)
libstdc++.so.6(GLIBCXX_3.4.11)
libstdc++.so.6(GLIBCXX_3.4.14)
libstdc++.so.6(GLIBCXX_3.4.15)
libstdc++.so.6(GLIBCXX_3.4.18)
libstdc++.so.6(GLIBCXX_3.4.19)
libstdc++.so.6(GLIBCXX_3.4.9)
libxcb.so.1
......@@ -18,9 +18,11 @@ libc.so.6()(64bit)
libc.so.6(GLIBC_2.11)(64bit)
libc.so.6(GLIBC_2.14)(64bit)
libc.so.6(GLIBC_2.15)(64bit)
libc.so.6(GLIBC_2.18)(64bit)
libc.so.6(GLIBC_2.2.5)(64bit)
libc.so.6(GLIBC_2.3)(64bit)
libc.so.6(GLIBC_2.3.2)(64bit)
libc.so.6(GLIBC_2.3.3)(64bit)
libc.so.6(GLIBC_2.3.4)(64bit)
libc.so.6(GLIBC_2.4)(64bit)
libc.so.6(GLIBC_2.6)(64bit)
......@@ -35,7 +37,6 @@ libexpat.so.1()(64bit)
libfontconfig.so.1()(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-3.so.0()(64bit)
libgdk_pixbuf-2.0.so.0()(64bit)
......@@ -58,12 +59,4 @@ libpthread.so.0(GLIBC_2.3.3)(64bit)
librt.so.1()(64bit)
librt.so.1(GLIBC_2.2.5)(64bit)
libsmime3.so()(64bit)
libstdc++.so.6()(64bit)
libstdc++.so.6(GLIBCXX_3.4)(64bit)
libstdc++.so.6(GLIBCXX_3.4.11)(64bit)
libstdc++.so.6(GLIBCXX_3.4.14)(64bit)
libstdc++.so.6(GLIBCXX_3.4.15)(64bit)
libstdc++.so.6(GLIBCXX_3.4.18)(64bit)
libstdc++.so.6(GLIBCXX_3.4.19)(64bit)
libstdc++.so.6(GLIBCXX_3.4.9)(64bit)
libxcb.so.1()(64bit)
gconf-service
libasound2 (>= 1.0.16)
libatk1.0-0 (>= 1.12.4)
libc6 (>= 2.15)
libdbus-1-3 (>= 1.1.4)
libc6 (>= 2.18)
libdbus-1-3 (>= 1.2.14)
libexpat1 (>= 2.0.1)
libfontconfig1 (>= 2.11)
libgcc1 (>= 1:4.1.1)
......@@ -12,7 +12,6 @@ libnspr4 (>= 2:4.9-2~)
libnss3 (>= 2:3.13.4-2~)
libpango-1.0-0 (>= 1.14.0)
libpangocairo-1.0-0 (>= 1.14.0)
libstdc++6 (>= 4.8.1)
libx11-6 (>= 2:1.4.99.1)
libx11-xcb1
libxcb1 (>= 1.6)
......@@ -22,7 +21,7 @@ libxdamage1 (>= 1:1.1)
libxext6
libxfixes3
libxi6 (>= 2:1.2.99.4)
libxrandr2
libxrandr2 (>= 2:1.2.99.3)
libxrender1
libxss1
libxtst6
{"linux-release-64/sizes/chrome-si/initializers": {"reva": 364170, "revb": 364170, "type": "absolute", "better": "lower", "improve": 7, "regress": 7, "tolerance": 0, "sha1": "de779422"},
"linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 271321, "revb": 271321, "type": "absolute", "better": "lower", "improve": 5, "regress": 7, "sha1": "f29296a1"},
{"linux-release-64/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 8, "regress": 8, "tolerance": 0, "sha1": "de779422"},
"linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 6, "regress": 8, "sha1": "f29296a1"},
"linux-release-64/sizes/nacl_helper_bootstrap-si/initializers": {"reva": 114822, "revb": 115019, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "228221af"},
"linux-release/sizes/chrome-si/initializers": {"reva": 281717, "revb": 281717, "type": "absolute", "better": "lower", "improve": 8, "regress": 8, "tolerance": 0, "sha1": "b639bbc4"},
"linux-release/sizes/nacl_helper-si/initializers": {"reva": 271321, "revb": 271321, "type": "absolute", "better": "lower", "improve": 6, "regress": 8, "sha1": "3394be7f"},
"linux-release/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 9, "regress": 9, "tolerance": 0, "sha1": "b639bbc4"},
"linux-release/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 7, "regress": 9, "sha1": "3394be7f"},
"linux-release/sizes/nacl_helper_bootstrap-si/initializers": {"reva": 114822, "revb": 115019, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "dd908f29"},
"mac-release/sizes/chrome-si/initializers": {"reva": 281731, "revb": 281731, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "tolerance": 0, "sha1": "01759b7f"},
"load": true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment