From e893247cfd2957e2a40c4ff8366bf093319c3489 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Wed, 22 Feb 2012 00:49:11 +0000 Subject: 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 --- third_party/adobe/flash/flash_player.gyp | 35 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'third_party/adobe') diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index a443af9..418509d 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/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)' ], }], }, ], -- cgit v1.1