summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoreustas@chromium.org <eustas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 07:46:54 +0000
committereustas@chromium.org <eustas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 07:46:54 +0000
commitc37ed9ded2b1d74b2d071c211ad5ed1a046afb2a (patch)
tree2c0bafea9225195aaae6b5c02ec838332ad16bb8 /chrome
parent50179c07697b3ecdcbfa2cde849e5a12d61a85f9 (diff)
downloadchromium_src-c37ed9ded2b1d74b2d071c211ad5ed1a046afb2a.zip
chromium_src-c37ed9ded2b1d74b2d071c211ad5ed1a046afb2a.tar.gz
chromium_src-c37ed9ded2b1d74b2d071c211ad5ed1a046afb2a.tar.bz2
Revert of Reenable linux_aura on the main builders. (Again). (https://codereview.chromium.org/138033023/)
Reason for revert: Blink layout tests are failing: http/tests/plugins/interrupted-get-url.html http/tests/plugins/third-party-cookie-accept-policy.html plugins/mouse-click-plugin-clears-selection.html Original issue's description: > Reenable linux_aura on the main builders. (Again). > > We upgraded the eu-strip binary so that it can deal with binaries that > are more than two gigabytes large. This should fix the crash on the > Google Chrome Linux builder, which was the only bot to break last night. > > BUG=319075,125106,303342,318961 > NOTRY=True > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245737 TBR=erg@chromium.org NOTREECHECKS=true NOTRY=true BUG=319075,125106,303342,318961 Review URL: https://codereview.chromium.org/143073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/installer/linux/debian/expected_deps7
-rw-r--r--chrome/installer/linux/rpm/expected_deps_i3864
-rw-r--r--chrome/installer/linux/rpm/expected_deps_x86_644
3 files changed, 5 insertions, 10 deletions
diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps
index ffe7ef2..bc68f7d 100644
--- a/chrome/installer/linux/debian/expected_deps
+++ b/chrome/installer/linux/debian/expected_deps
@@ -1,5 +1,6 @@
gconf-service
libasound2 (>= 1.0.23)
+libatk1.0-0 (>= 1.12.4)
libc6 (>= 2.11)
libcairo2 (>= 1.6.0)
libcap2 (>= 2.10)
@@ -12,7 +13,7 @@ libgcc1 (>= 1:4.1.1)
libgconf-2-4 (>= 2.31.1)
libgcrypt11 (>= 1.4.5)
libgdk-pixbuf2.0-0 (>= 2.22.0)
-libglib2.0-0 (>= 2.26.0)
+libglib2.0-0 (>= 2.18.0)
libgtk2.0-0 (>= 2.24.0)
libnspr4 (>= 1.8.0.10)
libnss3 (>= 3.14.3)
@@ -21,12 +22,10 @@ libstdc++6 (>= 4.6)
libudev0 (>= 147)
libx11-6 (>= 2:1.4.99.1)
libxcomposite1 (>= 1:0.3-1)
-libxcursor1 (>> 1.1.2)
libxdamage1 (>= 1:1.1)
libxext6
-libxfixes3 (>= 1:5.0)
+libxfixes3
libxi6 (>= 2:1.2.99.4)
-libxrandr2 (>= 2:1.2.99.2)
libxrender1
libxss1
libxtst6
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
index 52fd504..86a1f51 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -2,6 +2,7 @@ ld-linux.so.2
ld-linux.so.2(GLIBC_2.1)
ld-linux.so.2(GLIBC_2.3)
libasound.so.2
+libatk-1.0.so.0
libcairo.so.2
libcap.so.2
libc.so.6
@@ -35,7 +36,6 @@ libgconf-2.so.4
libgcrypt.so.11
libgdk_pixbuf-2.0.so.0
libgdk-x11-2.0.so.0
-libgio-2.0.so.0
libglib-2.0.so.0
libgobject-2.0.so.0
libgtk-x11-2.0.so.0
@@ -67,12 +67,10 @@ libstdc++.so.6(GLIBCXX_3.4.5)
libstdc++.so.6(GLIBCXX_3.4.9)
libX11.so.6
libXcomposite.so.1
-libXcursor.so.1
libXdamage.so.1
libXext.so.6
libXfixes.so.3
libXi.so.6
-libXrandr.so.2
libXrender.so.1
libXss.so.1
libXtst.so.6
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
index 1435e39..5fd2f01 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -2,6 +2,7 @@ ld-linux-x86-64.so.2()(64bit)
ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit)
ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)
libasound.so.2()(64bit)
+libatk-1.0.so.0()(64bit)
libcairo.so.2()(64bit)
libcap.so.2()(64bit)
libc.so.6()(64bit)
@@ -29,7 +30,6 @@ libgconf-2.so.4()(64bit)
libgcrypt.so.11()(64bit)
libgdk_pixbuf-2.0.so.0()(64bit)
libgdk-x11-2.0.so.0()(64bit)
-libgio-2.0.so.0()(64bit)
libglib-2.0.so.0()(64bit)
libgobject-2.0.so.0()(64bit)
libgtk-x11-2.0.so.0()(64bit)
@@ -57,12 +57,10 @@ libstdc++.so.6(GLIBCXX_3.4)(64bit)
libstdc++.so.6(GLIBCXX_3.4.9)(64bit)
libX11.so.6()(64bit)
libXcomposite.so.1()(64bit)
-libXcursor.so.1()(64bit)
libXdamage.so.1()(64bit)
libXext.so.6()(64bit)
libXfixes.so.3()(64bit)
libXi.so.6()(64bit)
-libXrandr.so.2()(64bit)
libXrender.so.1()(64bit)
libXss.so.1()(64bit)
libXtst.so.6()(64bit)