1 files changed, 25 insertions, 20 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index a09b351..76807bd 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -3,27 +3,32 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    [ 'OS == "win"', {
-      'targets': [
-        {
-          'target_name': 'flash_player',
-          'type': 'none',
-          'conditions': [
-            ['branding == "Chrome"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    'binaries/win/gcswf32.dll',
-                  ],
-                },
-              ],
-            }],
-          ],
-        },
+  # Always provide a target, so we can put the logic about whether there's
+  # anything to be done in this file (instead of a higher-level .gyp file).
+  'targets': [
+    {
+      'target_name': 'flash_player',
+      'type': 'none',
+      'conditions': [
+        [ 'branding == "Chrome"', {
+          'copies': [{
+            'destination': '<(PRODUCT_DIR)',
+            'conditions': [
+              [ 'OS == "linux" and target_arch == "ia32"', {
+                'files': [ 'binaries/linux/libgcflashplayer.so' ]
+              }],
+              [ 'OS == "mac"', {
+                'files':
+                    [ 'binaries/mac/Flash Player Plugin for Chrome.plugin' ]
+              }],
+              [ 'OS == "win"', {
+                'files': [ 'binaries/win/gcswf32.dll' ]
+              }],
+            ],
+          }],
+        }],
       ],
-    }],
+    },
   ],
 }