diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 23:05:35 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 23:05:35 +0000 |
| commit | 3a81abb7d35067e4e42ec2b2408b3b4adff95b94 (patch) | |
| tree | 08ed97196036438bdb08857f7173e18d834c7651 /third_party | |
| parent | 266a4d7dfd70f588d53515c38ab534b59981c4ab (diff) | |
| download | chromium_src-3a81abb7d35067e4e42ec2b2408b3b4adff95b94.zip chromium_src-3a81abb7d35067e4e42ec2b2408b3b4adff95b94.tar.gz chromium_src-3a81abb7d35067e4e42ec2b2408b3b4adff95b94.tar.bz2 | |
Stage Flapper binaries for Windows.
This is only step 1 -- this brings binaries (and the crazy header) into the
build process.
Review URL: http://codereview.chromium.org/10067013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index 26ef68a..3dec8a1 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -9,6 +9,13 @@ 'conditions': [ [ 'branding == "Chrome"', { 'conditions': [ + [ 'OS == "linux" and target_arch == "ia32"', { + 'flapper_version_h_file%': 'symbols/ppapi/linux/flapper_version.h', + 'flapper_binary_files%': [ + 'binaries/ppapi/linux/libpepflashplayer.so', + 'binaries/ppapi/linux/manifest.json', + ], + }], [ 'OS == "linux" and target_arch == "x64"', { 'flapper_version_h_file%': 'symbols/ppapi/linux_x64/flapper_version.h', 'flapper_binary_files%': [ @@ -16,11 +23,11 @@ 'binaries/ppapi/linux_x64/manifest.json', ], }], - [ 'OS == "linux" and target_arch == "ia32"', { - 'flapper_version_h_file%': 'symbols/ppapi/linux/flapper_version.h', + [ 'OS == "win"', { + 'flapper_version_h_file%': 'symbols/ppapi/win/flapper_version.h', 'flapper_binary_files%': [ - 'binaries/ppapi/linux/libpepflashplayer.so', - 'binaries/ppapi/linux/manifest.json', + 'binaries/ppapi/win/pepflashplayer.dll', + 'binaries/ppapi/win/manifest.json', ], }], ], |