Roll chromium_revision 310ea93..8cf53d6 (349094:351112)

webrtc/modules/video_coding/codecs/vp8/vp8.gyp

 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [
     '../../../../build/common.gypi',
   ],
   'targets': [
     {
       'target_name': 'webrtc_vp8',
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
-            '<(libvpx_dir)/libvpx.gyp:libvpx',
+            '<(libvpx_dir)/libvpx.gyp:libvpx_new',
           ],
         }],
       ],
       'sources': [
         'default_temporal_layers.cc',
         'default_temporal_layers.h',
         'include/vp8.h',
         'include/vp8_common_types.h',
         'realtime_temporal_layers.cc',
         'reference_picture_selection.cc',
@@ skipping 30 matching lines @@
             '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser',
           ],
           'sources': [
             'vp8_sequence_coder.cc',
           ],
         },
       ], # targets
     }], # include_tests
   ],
 }