Merge 48978 to 375 - Include plugin.vch files for Flash Player (on official b...

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'includes': [
     # Two versions of installer_util target are defined in installer_util.gypi.
     # This allows to keep all the settings relevant to these targets in one
@@ skipping 350 matching lines @@
         'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
         'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
                     '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
         'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
                     '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
         'conditions': [
           ['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'],
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/libgcflashplayer.so',
+              '<(PRODUCT_DIR)/plugin.vch',
+            ],
           }],
           ['target_arch=="x64"', {
             'deb_arch': 'amd64',
             'rpm_arch': 'x86_64',
           }],
         ],
       },
       'targets': [
         {
           'target_name': 'linux_installer_configs',
@@ skipping 384 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: