diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:10:17 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:10:17 +0000 |
| commit | aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b (patch) | |
| tree | b7adc732ccdc7891e7aaf58e92d509b3f3566665 /media | |
| parent | 43c7bc30cba6878344087ae8580f4ce9d4fe0af9 (diff) | |
| download | chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.zip chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.tar.gz chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.tar.bz2 | |
Fix libssl.so link failures on Linux shared lib build.
http://build.chromium.org/buildbot/waterfall.fyi/builders/Chromium%20Linux%20Builder%20(dbg-shlib)/builds/6369/steps/compile/logs/stdio
This has been broken for a long time, I think basically since Linux switched to
use_system_ssl=0.
Also fix a couple unrelated shared lib failures in media.
Review URL: http://codereview.chromium.org/553097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/media.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index af218a1..2c57239d 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -285,6 +285,13 @@ '../base/base.gyp:base_i18n', '../testing/gtest.gyp:gtest', ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], + ], 'sources': [ 'omx/omx_unittest.cc', 'omx/run_all_unittests.cc', @@ -358,6 +365,7 @@ ], 'link_settings': { 'libraries': [ + '-ldl', '-lX11', '-lXrender', '-lXext', |