diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:25:09 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:25:09 +0000 |
| commit | 1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc (patch) | |
| tree | 907cd1f3e07b67526d4cb29209c896425d4cdf3b /remoting/remoting.gyp | |
| parent | b0da24bc22a1726c240f8d9392381ff66c4cca3c (diff) | |
| download | chromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.zip chromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.tar.gz chromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.tar.bz2 | |
Enable media.dll / libmedia.so.
Review URL: http://codereview.chromium.org/7572040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 3524188..f814e4f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -213,15 +213,6 @@ 'host/plugin/host_plugin.rc', ], }], - ['target_arch=="arm"', { - 'dependencies': [ - '../third_party/libvpx/libvpx.gyp:libvpx_lib', - ], - }, { - 'dependencies': [ - '../third_party/libvpx/libvpx.gyp:libvpx', - ], - }], ], }, # end of target 'remoting_host_plugin' { @@ -344,12 +335,19 @@ ], 'conditions': [ ['target_arch=="arm"', { + 'dependencies': [ + '../third_party/libvpx/libvpx.gyp:libvpx_lib', + ], 'sources!': [ 'base/decoder_vp8.cc', 'base/decoder_vp8.h', 'base/encoder_vp8.cc', 'base/encoder_vp8.h', ], + }, { + 'dependencies': [ + '../third_party/libvpx/libvpx.gyp:libvpx', + ], }], ], }, # end of target 'remoting_base' |