diff --git a/.gitignore b/.gitignore index 55b4861c8f..45a84f7cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -111,7 +111,7 @@ /third_party/libjpeg /third_party/libjpeg_turbo /third_party/libsrtp -/third_party/libvpx +/third_party/libvpx_new /third_party/libxml /third_party/libudev /third_party/libyuv diff --git a/DEPS b/DEPS index e524512a7b..47ac5a61fa 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '310ea93837e4a95944fcd82ff54d0e0ea5186a2c', + 'chromium_revision': '8cf53d6715889128e790939ce36e827071984a40', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/chromium/.gclient b/chromium/.gclient index 573a4558bf..7f46333e45 100644 --- a/chromium/.gclient +++ b/chromium/.gclient @@ -17,7 +17,6 @@ solutions = [{ 'src/third_party/skia': None, 'src/third_party/trace-viewer': None, 'src/third_party/webrtc': None, - 'src/third_party/WebKit': None, }, 'safesync_url': '' }] diff --git a/setup_links.py b/setup_links.py index 44f3f075f1..99b526076c 100755 --- a/setup_links.py +++ b/setup_links.py @@ -49,7 +49,7 @@ DIRECTORIES = [ 'third_party/libjpeg_turbo', 'third_party/libsrtp', 'third_party/libudev', - 'third_party/libvpx', + 'third_party/libvpx_new', 'third_party/libyuv', 'third_party/llvm-build', 'third_party/lss', diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 5caa6cc10c..7b17d43662 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -102,7 +102,7 @@ 'build_with_mozilla%': 0, # Make it possible to provide custom locations for some libraries. - 'libvpx_dir%': '<(DEPTH)/third_party/libvpx', + 'libvpx_dir%': '<(DEPTH)/third_party/libvpx_new', 'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 'opus_dir%': '<(opus_dir)', diff --git a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc index 5173b33faa..b9c8f0bacc 100644 --- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc @@ -27,7 +27,7 @@ char kTSanDefaultSuppressions[] = "race:rtc::MessageQueue::Quit\n" "race:FileVideoCapturerTest::VideoCapturerListener::OnFrameCaptured\n" "race:vp8cx_remove_encoder_threads\n" -"race:third_party/libvpx/source/libvpx/vp9/common/vp9_scan.h\n" +"race:third_party/libvpx_new/source/libvpx/vp9/common/vp9_scan.h\n" // Usage of trace callback and trace level is racy in libjingle_media_unittests. // https://code.google.com/p/webrtc/issues/detail?id=3372 diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index b93bc5e82f..261e9d7d37 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -117,6 +117,6 @@ declare_args() { # Make it possible to provide custom locations for some libraries (move these # up into declare_args should we need to actually use them for the GN build). -rtc_libvpx_dir = "//third_party/libvpx" +rtc_libvpx_dir = "//third_party/libvpx_new" rtc_libyuv_dir = "//third_party/libyuv" rtc_opus_dir = "//third_party/opus" diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index adf1624bca..38c1c0471a 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -341,7 +341,7 @@ }], ['build_libvpx==1', { 'dependencies': [ - '<(libvpx_dir)/libvpx.gyp:libvpx', + '<(libvpx_dir)/libvpx.gyp:libvpx_new', ], }], ['OS=="android"', { diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp index c92509c8b5..a60a4766da 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp +++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp @@ -23,7 +23,7 @@ 'conditions': [ ['build_libvpx==1', { 'dependencies': [ - '<(libvpx_dir)/libvpx.gyp:libvpx', + '<(libvpx_dir)/libvpx.gyp:libvpx_new', ], }], ], diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp index ac7e67a79c..752521c5cb 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp +++ b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp @@ -22,7 +22,7 @@ 'conditions': [ ['build_libvpx==1', { 'dependencies': [ - '<(libvpx_dir)/libvpx.gyp:libvpx', + '<(libvpx_dir)/libvpx.gyp:libvpx_new', ], }], ['build_vp9==1', {