diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:35:08 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:35:08 +0000 |
| commit | e671e43a899d88defb94244882c8e9adf99caa82 (patch) | |
| tree | c8e85f9200f54f2208726d9074712d0aac060a32 /third_party | |
| parent | 32beec0c62867a9a31fc3aa17ccedfb486faf8f3 (diff) | |
| download | chromium_src-e671e43a899d88defb94244882c8e9adf99caa82.zip chromium_src-e671e43a899d88defb94244882c8e9adf99caa82.tar.gz chromium_src-e671e43a899d88defb94244882c8e9adf99caa82.tar.bz2 | |
Revert 207538 "Add 64-bit Pepper Flash for Mac."
> Add 64-bit Pepper Flash for Mac.
>
> R=shess@chromium.org
>
> Review URL: https://codereview.chromium.org/17507002
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/17512002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index 5c0528c..ea6ddb0 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -23,20 +23,13 @@ 'binaries/ppapi/linux_x64/manifest.json', ], }], - [ 'OS == "mac" and target_arch == "ia32"', { + [ 'OS == "mac"', { '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%': [ |