diff options
| -rw-r--r-- | chrome/chrome_exe.gypi | 13 | ||||
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 45 |
2 files changed, 37 insertions, 21 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 570357d4..90421e3 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -130,6 +130,11 @@ 'variables': { 'chrome_exe_target': 1, }, + 'dependencies': [ + # Copy a Flash Player binary to PRODUCT_DIR if applicable. + # Let the .gyp file decide what to do on a per-OS basis. + '../third_party/adobe/flash/flash_player.gyp:flash_player', + ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'actions': [ @@ -385,6 +390,13 @@ 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Helper.app', ], + 'conditions': [ + [ 'branding == "Chrome"', { + 'files': [ + '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin', + ], + }], + ], }, ], 'postbuilds': [ @@ -470,7 +482,6 @@ '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', - '../third_party/adobe/flash/flash_player.gyp:flash_player', 'app/locales/locales.gyp:*', ], 'msvs_settings': { 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' ] + }], + ], + }], + }], ], - }], + }, ], } |