Clean up the libraries to install

script/cibuild

@@ -10,13 +10,16 @@ from lib.util import execute, rm_rf, scoped_env
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 LINUX_DEPS = [
+  'gcc-multilib',
+  'g++-multilib',
+]
+
+LINUX_DEPS_AMD64 = [
   'libdbus-1-dev',
   'libgconf2-dev',
   'libgnome-keyring-dev',
   'libgtk2.0-dev',
   'libnotify-dev',
-  'gcc-multilib',
-  'g++-multilib',
 ]
 
 LINUX_DEPS_ARM = [
@@ -25,15 +28,6 @@ LINUX_DEPS_ARM = [
   'g++-arm-linux-gnueabihf',
 ]
 
-LINUX_DEPS_I386 = [
-  'linux-libc-dev:i386',
-  'libdbus-1-dev:i386',
-  'libgconf2-dev:i386',
-  'libgnome-keyring-dev:i386',
-  'libgtk2.0-dev:i386',
-  'libnotify-dev:i386',
-]
-
 
 def main():
   os.environ['CI'] = '1'
@@ -49,8 +43,8 @@ def main():
     deps = LINUX_DEPS
     if target_arch == 'arm':
       deps += LINUX_DEPS_ARM
-    elif target_arch == 'ia32':
-      deps += LINUX_DEPS_I386
+    elif target_arch == 'x64':
+      deps += LINUX_DEPS_AMD64
     execute(['sudo', 'apt-get', 'install'] + deps)
 
     os.environ['DISPLAY'] = ':99.0'