diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:58:51 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:58:51 +0000 |
| commit | d3c8aa84c5bf94c58b88b35d169694837cb454e5 (patch) | |
| tree | 658c8300583e4adb5148c0d093677bf14690e28c /remoting | |
| parent | 4fbd79f46b1e5c580238c3cf0a8532144019e7d0 (diff) | |
| download | chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.zip chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.gz chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.bz2 | |
Revert r95841 due to failing media_unittests on linux_shared bot.
TBR=fischman@chromium.org
Review URL: http://codereview.chromium.org/7601002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index f814e4f..3524188 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -213,6 +213,15 @@ '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' { @@ -335,19 +344,12 @@ ], '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' |