Copy Pepper Flash files into the right place (during build time) for …

…Linux x64.

This only applies to Chrome-branded builds (and requires that the files be
available).

Note: More changes will still be needed to actually include the files in
distribution packages.


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

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

chrome/chrome_dll.gypi

@@ -316,7 +316,10 @@
                 # On Mac, Flash gets put into the framework, so we need this
                 # dependency here. flash_player.gyp will copy the Flash bundle
                 # into PRODUCT_DIR.
+                # TODO(viettrungluu): Once enabled for Mac, Flapper binaries
+                # will also need to be put into the bundle.
                 '../third_party/adobe/flash/flash_player.gyp:flash_player',
+                '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
                 'chrome_resources.gyp:packed_extra_resources',
                 'chrome_resources.gyp:packed_resources',
               ],

chrome/chrome_exe.gypi

@@ -407,6 +407,7 @@
             # file decide what to do on a per-OS basis; on Mac, internal plugins
             # go inside the framework, so this dependency is in chrome_dll.gypi.
             '../third_party/adobe/flash/flash_player.gyp:flash_player',
+            '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
           ],
         }],
         ['OS=="linux"', {

third_party/adobe/flash/flash_player.gyp

@@ -3,6 +3,23 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'flapper_version_h_file%': 'flapper_version.h',
+    'flapper_binary_files%': [],
+    'conditions': [
+      [ 'branding == "Chrome"', {
+        'conditions': [
+          [ 'OS == "linux" and target_arch == "x64"', {
+            'flapper_version_h_file%': 'symbols/ppapi/linux_x64/flapper_version.h',
+            'flapper_binary_files%': [
+              'binaries/ppapi/linux_x64/libpepflashplayer.so',
+              'binaries/ppapi/linux_x64/manifest.json',
+            ],
+          }],
+        ],
+      }],
+    ],
+  },
   # 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': [
@@ -45,15 +62,15 @@
       'type': 'none',
       'copies': [{
         'destination': '<(SHARED_INTERMEDIATE_DIR)',
-        'files': [],
-        'conditions': [
-          # TODO(viettrungluu): actually bring in the headers.
-          [ '1 == 1', {
-            'files': [
-              'flapper_version.h',  # The default, which indicates no Flapper.
-            ],
-          }],
-        ],
+        'files': [ '<(flapper_version_h_file)' ],
+      }],
+    },
+    {
+      'target_name': 'flapper_binaries',
+      'type': 'none',
+      'copies': [{
+        'destination': '<(PRODUCT_DIR)/PepperFlash',
+        'files': [ '<@(flapper_binary_files)' ],
       }],
     },
   ],