Roll in ffmpeg, libvpx and gyp to build libvpx on ARM

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 147 matching lines @@
     {
       'target_name': 'remoting_host_plugin',
       'type': 'loadable_module',
       'defines': [
         'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
       ],
       'dependencies': [
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
+        '../third_party/libvpx/libvpx.gyp:libvpx',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
         'host/plugin/host_plugin.cc',
         'host/plugin/host_plugin.def',
         'host/plugin/host_plugin.rc',
         'host/plugin/host_plugin_resource.h',
         'host/plugin/host_plugin_utils.cc',
         'host/plugin/host_plugin_utils.h',
         'host/plugin/host_script_object.cc',
@@ skipping 28 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 41 matching lines @@
     }, # end of target 'webapp_it2me'
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
         '../media/media.gyp:yuv_convert',
         'remoting_jingle_glue',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
         'proto/trace.gyp:trace_proto_lib',
         # TODO(hclam): Enable VP8 in the build.
         #'third_party/on2/on2.gyp:vp8',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
+      # TODO(hclam): Remove this and depend on libvpx directly once we remove
+      # libvpx from FFmpeg.
+      'include_dirs': [
+        '../third_party/libvpx/source/libvpx',
+      ],
       # This target needs a hard dependency because dependent targets
       # depend on chromotocol_proto_lib for headers.
       'hard_dependency': 1,
       'sources': [
         'base/auth_token_util.cc',
         'base/auth_token_util.h',
         'base/capture_data.cc',
         'base/capture_data.h',
         'base/compound_buffer.cc',
         'base/compound_buffer.h',
@@ skipping 516 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
 }