summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 00:27:41 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 00:27:41 +0000
commit56510ba355dee2cd6592cdf0d27c4c41ef0cae8b (patch)
tree6bbd0169df49c97a12f6915624ae5e8ca01a4945 /third_party
parent64f3b2e53900b02337eef809c49029f5cb0bf95c (diff)
downloadchromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.zip
chromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.tar.gz
chromium_src-56510ba355dee2cd6592cdf0d27c4c41ef0cae8b.tar.bz2
Add PepperFlash to OSX Canary build.
Add it to the build, and show it between inbuilt NPAPI Flash and any system NPAPI Flash on Canary. BUG=115437 TEST=PepperFlashPlayer.plugin is in the bundle. TEST=about:plugins shows it after inbuilt NPAPI Flash. TEST=PepperFlash loads and plays a YouTube video or something. Review URL: https://chromiumcodereview.appspot.com/10494003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/adobe/flash/flash_player.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index 3dec8a1..8b981f0 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -23,6 +23,13 @@
'binaries/ppapi/linux_x64/manifest.json',
],
}],
+ [ '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 == "win"', {
'flapper_version_h_file%': 'symbols/ppapi/win/flapper_version.h',
'flapper_binary_files%': [