diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:21:08 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:21:08 +0000 |
| commit | bc1786c826d6a7cf1a4b06455782180977d965f6 (patch) | |
| tree | 508b65d8c8b279501e11c596b23cd3961dfe2625 /third_party/adobe | |
| parent | 8c350eab49062665fd2386e1a6ede82b4ecd3574 (diff) | |
| download | chromium_src-bc1786c826d6a7cf1a4b06455782180977d965f6.zip chromium_src-bc1786c826d6a7cf1a4b06455782180977d965f6.tar.gz chromium_src-bc1786c826d6a7cf1a4b06455782180977d965f6.tar.bz2 | |
Made sure we use ChromeOS version of flash for ChromeOS builds.
TEST=none
BUG=chromium-os:6013
Review URL: http://codereview.chromium.org/3283004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/adobe')
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index b34a14b..a9f60f8 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -15,7 +15,12 @@ 'destination': '<(PRODUCT_DIR)', 'files': [], 'conditions': [ - [ 'OS == "linux" and target_arch == "ia32"', { + [ 'chromeos == 1', { + 'files': [ + 'binaries/chromeos/libgcflashplayer.so', + ] + }], + [ 'OS == "linux" and target_arch == "ia32" and chromeos == 0', { 'files': [ 'binaries/linux/libgcflashplayer.so', 'binaries/linux/plugin.vch', |