[Linux packaging] Remove i386 expected deps files

This CL removes debian/expected_deps_ia32_jessie and
rpm/expected_deps_i386.  We no longer do official x86 builds, so the
files are unnecessary and only serve as a source of confusion when
updating the x86_64 deps files.

R=thestig@chromium.org

Change-Id: Ie14ba3c314aa82a172bfe20bed4498c1bdb3fdb8
Reviewed-on: https://chromium-review.googlesource.com/592312Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490642}

chrome/installer/linux/BUILD.gn

@@ -99,7 +99,6 @@ copy("deb_packaging_files") {
     "debian/changelog.template",
     "debian/control.template",
     "debian/debian.menu",
-    "debian/expected_deps_ia32_jessie",
     "debian/expected_deps_x64_jessie",
     "debian/postinst",
     "debian/postrm",
@@ -135,7 +134,6 @@ if (!is_chromeos) {
     sources = [
       "rpm/build.sh",
       "rpm/chrome.spec.template",
-      "rpm/expected_deps_i386",
       "rpm/expected_deps_x86_64",
     ]
     outputs = [

chrome/installer/linux/debian/build.sh

@@ -295,13 +295,14 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | LANG=C sort > actual
 
 # Compare the expected dependency list to the generated list.
 BAD_DIFF=0
-diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${TARGET_DISTRO}" actual || \
-  BAD_DIFF=1
+if [ -r "$SCRIPTDIR/expected_deps_${TARGETARCH}_${TARGET_DISTRO}" ]; then
+  diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${TARGET_DISTRO}" actual || \
+    BAD_DIFF=1
+fi
 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
   echo
   echo "ERROR: Shared library dependencies changed!"
   echo "If this is intentional, please update:"
-  echo "chrome/installer/linux/debian/expected_deps_ia32_jessie"
   echo "chrome/installer/linux/debian/expected_deps_x64_jessie"
   echo
   exit $BAD_DIFF

chrome/installer/linux/debian/expected_deps_ia32_jessie

-gconf-service
-libasound2 (>= 1.0.16)
-libatk1.0-0 (>= 1.12.4)
-libc6 (>= 2.18)
-libcairo2 (>= 1.2.4)
-libcups2 (>= 1.4.0)
-libdbus-1-3 (>= 1.2.14)
-libexpat1 (>= 2.0.1)
-libfontconfig1 (>= 2.11)
-libgcc1 (>= 1:4.1.1)
-libgconf-2-4 (>= 3.2.5)
-libgdk-pixbuf2.0-0 (>= 2.22.0)
-libglib2.0-0 (>= 2.31.8)
-libgtk2.0-0 (>= 2.24.0)
-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)
-libx11-6 (>= 2:1.4.99.1)
-libx11-xcb1
-libxcb1 (>= 1.6)
-libxcomposite1 (>= 1:0.3-1)
-libxcursor1 (>> 1.1.2)
-libxdamage1 (>= 1:1.1)
-libxext6
-libxfixes3
-libxi6 (>= 2:1.2.99.4)
-libxrandr2 (>= 2:1.2.99.3)
-libxrender1
-libxss1
-libxtst6

chrome/installer/linux/rpm/build.sh

@@ -105,16 +105,17 @@ do_package() {
   # link-time code rewriting, but it might leave the symbol dependency in
   # place -- there are no guarantees.
   BAD_DIFF=0
-  diff -u "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
-      <(echo "${DETECTED_DEPENDS}" | \
-        LANG=C sort | \
-        grep -v '^ld-linux.*\(GLIBC_2\.3\)') \
-      || BAD_DIFF=1
+  if [ -r "$SCRIPTDIR/expected_deps_$ARCHITECTURE" ]; then
+    diff -u "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
+        <(echo "${DETECTED_DEPENDS}" | \
+          LANG=C sort | \
+          grep -v '^ld-linux.*\(GLIBC_2\.3\)') \
+        || BAD_DIFF=1
+  fi
   if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
     echo
     echo "ERROR: Shared library dependencies changed!"
     echo "If this is intentional, please update:"
-    echo "chrome/installer/linux/rpm/expected_deps_i386"
     echo "chrome/installer/linux/rpm/expected_deps_x86_64"
     echo
     exit $BAD_DIFF

chrome/installer/linux/rpm/expected_deps_i386

-ld-linux.so.2
-ld-linux.so.2(GLIBC_2.0)
-ld-linux.so.2(GLIBC_2.1)
-libX11-xcb.so.1
-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
-libasound.so.2
-libatk-1.0.so.0
-libc.so.6
-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)
-libc.so.6(GLIBC_2.7)
-libc.so.6(GLIBC_2.9)
-libcairo.so.2
-libcups.so.2
-libdbus-1.so.3
-libdl.so.2
-libdl.so.2(GLIBC_2.0)
-libdl.so.2(GLIBC_2.1)
-libexpat.so.1
-libfontconfig.so.1
-libgcc_s.so.1
-libgcc_s.so.1(GLIBC_2.0)
-libgconf-2.so.4
-libgdk-x11-2.0.so.0
-libgdk_pixbuf-2.0.so.0
-libgio-2.0.so.0
-libglib-2.0.so.0
-libgmodule-2.0.so.0
-libgobject-2.0.so.0
-libgtk-x11-2.0.so.0
-libm.so.6
-libm.so.6(GLIBC_2.0)
-libm.so.6(GLIBC_2.1)
-libnspr4.so
-libnss3.so
-libnssutil3.so
-libpango-1.0.so.0
-libpangocairo-1.0.so.0
-libpthread.so.0
-libpthread.so.0(GLIBC_2.0)
-libpthread.so.0(GLIBC_2.1)
-libpthread.so.0(GLIBC_2.2)
-libpthread.so.0(GLIBC_2.2.3)
-libpthread.so.0(GLIBC_2.3.2)
-libpthread.so.0(GLIBC_2.3.3)
-librt.so.1
-librt.so.1(GLIBC_2.2)
-libsmime3.so
-libxcb.so.1