More changes to include/use Flapper on Linux ia32 (and remove NPAPI Flash).

NOTRY=true

Review URL: http://codereview.chromium.org/9702030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126833 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 34 deletions

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 3a21826..ad3d1ea 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -438,6 +438,8 @@
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/nacl_helper',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap',
+          '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
+          '<(PRODUCT_DIR)/PepperFlash/manifest.json',
           '<@(default_apps_list_linux_dest)',
         ],
         'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
@@ -451,10 +453,7 @@
           ['target_arch=="ia32"', {
             'deb_arch': 'i386',
             'rpm_arch': 'i386',
-            # Flash Player for Linux is currently only available for ia32.
             'packaging_files_binaries': [
-              '<(PRODUCT_DIR)/libgcflashplayer.so',
-              '<(PRODUCT_DIR)/plugin.vch',
               '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
             ],
           }],
@@ -462,8 +461,6 @@
             'deb_arch': 'amd64',
             'rpm_arch': 'x86_64',
             'packaging_files_binaries': [
-              '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
-              '<(PRODUCT_DIR)/PepperFlash/manifest.json',
               '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
             ],
           }],
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 8159c02..cdf2700 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -99,17 +99,6 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
-  # Flash Player files:
-  {
-    'filename': 'libgcflashplayer.so',
-    'arch': ['32bit'],
-    'buildtype': ['official'],
-  },
-  {
-    'filename': 'plugin.vch',
-    'arch': ['32bit'],
-    'buildtype': ['official'],
-  },
   # PDF Plugin files:
   {
     'filename': 'libpdf.so',
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 35d990a..8bad4cd 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -100,18 +100,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   # Flash Player files:
-  # TODO(viettrungluu): Remove these once all the changes have been made to
-  # include/use Pepper Flash on 32-bit Linux.
-  {
-    'filename': 'libgcflashplayer.so',
-    'arch': ['32bit'],
-    'buildtype': ['official'],
-  },
-  {
-    'filename': 'plugin.vch',
-    'arch': ['32bit'],
-    'buildtype': ['official'],
-  },
   # Pepper Flash Player files:
   {
     'filename': 'PepperFlash',
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index d6cbf840..5f24a42 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -39,12 +39,6 @@
             'destination': '<(PRODUCT_DIR)',
             'files': [],
             'conditions': [
-              [ 'OS == "linux" and target_arch == "ia32"', {
-                'files': [
-                  'binaries/linux/libgcflashplayer.so',
-                  'binaries/linux/plugin.vch',
-                ]
-              }],
               [ 'OS == "mac"', {
                 'files': [
                   'binaries/mac/Flash Player Plugin for Chrome.plugin',