From 78fb0befb7193b3a1093f9470686d755b623015f Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Fri, 26 Mar 2010 21:20:41 +0000 Subject: .gyp(i) changes to put "Cobwerks" into the right place(s) on Linux and Mac. BUG=none TEST=everything should still build Review URL: http://codereview.chromium.org/1409003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42819 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/adobe/flash/flash_player.gyp | 45 ++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 20 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 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' ] + }], + ], + }], + }], ], - }], + }, ], } -- cgit v1.1