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

third_party/adobe/flash/flash_player.gyp

Index: third_party/adobe/flash/flash_player.gyp
===================================================================
--- third_party/adobe/flash/flash_player.gyp	(revision 49085)
+++ third_party/adobe/flash/flash_player.gyp	(working copy)
@@ -16,14 +16,22 @@
             'files': [],
             'conditions': [
               [ 'OS == "linux" and target_arch == "ia32"', {
-                'files': [ 'binaries/linux/libgcflashplayer.so' ]
+                'files': [
+                  'binaries/linux/libgcflashplayer.so',
+                  'binaries/linux/plugin.vch',
+                ]
               }],
               [ 'OS == "mac"', {
-                'files':
-                    [ 'binaries/mac/Flash Player Plugin for Chrome.plugin' ]
+                'files': [
+                  'binaries/mac/Flash Player Plugin for Chrome.plugin',
+                  'binaries/mac/plugin.vch',
+                ]
               }],
               [ 'OS == "win"', {
-                'files': [ 'binaries/win/gcswf32.dll' ]
+                'files': [
+                  'binaries/win/gcswf32.dll',
+                  'binaries/win/plugin.vch',
+                ]
               }],
             ],
           }],