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

webrtc/modules/modules.gyp

 # Copyright (c) 2011 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': [
@@ skipping 323 matching lines @@
                 'audioproc_unittest_proto',
               ],
               'sources': [
                 'audio_processing/audio_processing_impl_unittest.cc',
                 'audio_processing/test/audio_processing_unittest.cc',
                 'audio_processing/test/test_utils.h',
               ],
             }],
             ['build_libvpx==1', {
               'dependencies': [
-                '<(libvpx_dir)/libvpx.gyp:libvpx',
+                '<(libvpx_dir)/libvpx.gyp:libvpx_new',
               ],
             }],
             ['OS=="android"', {
               'dependencies': [
                 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
               ],
               # Need to disable error due to the line in
               # base/android/jni_android.h triggering it:
               # const BASE_EXPORT jobject GetApplicationContext()
               # error: type qualifiers ignored on function return type
@@ skipping 138 matching lines @@
               'sources': [
                 'modules_unittests.isolate',
               ],
             },
           ],
         }],
       ],
     }], # include_tests
   ], # conditions
 }