Revert r95841 due to failing media_unittests on linux_shared bot.

remoting/remoting.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     # Use a consistent MIME-type independent of branding.
@@ skipping 195 matching lines @@
               },
             }],
           ],  # conditions
         }],  # OS=="mac"
         ['OS!="win"', {
           'sources!': [
             'host/plugin/host_plugin.def',
             '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'
     {
       'target_name': 'webapp_it2me',
       'type': 'none',
       'dependencies': [
         'remoting_host_plugin',
       ],
       'sources': [
         'webapp/build-webapp.py',
@@ skipping 102 matching lines @@
         'base/task_thread_proxy.cc',
         'base/task_thread_proxy.h',
         'base/tracer.cc',
         'base/tracer.h',
         'base/types.h',
         'base/util.cc',
         'base/util.h',
       ],
       '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'
 
     {
       'target_name': 'remoting_host',
       'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
@@ skipping 460 matching lines @@
         ['target_arch=="arm"', {
           'sources!': [
             'base/decoder_vp8_unittest.cc',
             'base/encoder_vp8_unittest.cc',
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }