diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:23:06 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:23:06 +0000 |
| commit | d87e92f0dec49cb5c672008e8b4e130006a944f9 (patch) | |
| tree | 03ff796cc26aac99d16846a999448773b70b1c75 /third_party/adobe | |
| parent | e4d46c35a05efde6e46b98022d13b4b5384323cb (diff) | |
| download | chromium_src-d87e92f0dec49cb5c672008e8b4e130006a944f9.zip chromium_src-d87e92f0dec49cb5c672008e8b4e130006a944f9.tar.gz chromium_src-d87e92f0dec49cb5c672008e8b4e130006a944f9.tar.bz2 | |
Add 64-bit Pepper Flash for Mac.
R=shess@chromium.org
Review URL: https://codereview.chromium.org/17507002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/adobe')
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index ea6ddb0..5c0528c 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -23,13 +23,20 @@ 'binaries/ppapi/linux_x64/manifest.json', ], }], - [ 'OS == "mac"', { + [ 'OS == "mac" and target_arch == "ia32"', { 'flapper_version_h_file%': 'symbols/ppapi/mac/flapper_version.h', 'flapper_binary_files%': [ 'binaries/ppapi/mac/PepperFlashPlayer.plugin', 'binaries/ppapi/mac/manifest.json', ], }], + [ 'OS == "mac" and target_arch == "x64"', { + 'flapper_version_h_file%': 'symbols/ppapi/mac_64/flapper_version.h', + 'flapper_binary_files%': [ + 'binaries/ppapi/mac_64/PepperFlashPlayer.plugin', + 'binaries/ppapi/mac_64/manifest.json', + ], + }], [ 'OS == "win"', { 'flapper_version_h_file%': 'symbols/ppapi/win/flapper_version.h', 'flapper_binary_files%': [ |