Roll chromium_revision ee31124..508edd3 (378158:379249)

webrtc/build/common.gypi

 # 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.
 
 # This file contains common settings for building WebRTC components.
 
@@ skipping 94 matching lines @@
     'build_openmax_dl%': 1,
     'build_opus%': 1,
     'build_protobuf%': 1,
     'build_ssl%': 1,
     'build_usrsctp%': 1,
 
     # Disable by default
     'have_dbus_glib%': 0,
 
     # Make it possible to provide custom locations for some libraries.
-    'libvpx_dir%': '<(DEPTH)/third_party/libvpx_new',
+    'libvpx_dir%': '<(DEPTH)/third_party/libvpx',
     'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
     'opus_dir%': '<(opus_dir)',
 
     # Use Java based audio layer as default for Android.
     # Change this setting to 1 to use Open SL audio instead.
     # TODO(henrika): add support for Open SL ES.
     'enable_android_opensl%': 0,
 
     # Link-Time Optimizations
     # Executes code generation at link-time instead of compile-time
@@ skipping 366 matching lines @@
           # For access to standard POSIXish features, use WEBRTC_POSIX instead
           # of a more specific macro.
           'defines': [
             'WEBRTC_POSIX',
           ],
         }],
       ],
     },
   }, # target_defaults
 }