Roll chromium_revision 310ea93..8cf53d6 (349094:351112)
Our perf test suite webrtc_perf_tests timed out, which caused most
of the delay landing this (https://crbug.comn/535973 and
https://codereview.chromium.org/1370133004).
Other problems with executing Android tests also needed to be
resolved in order to land this (http://crbug.com/534849).
Libvpx has moved from third_party/libvpx to third_party/libvpx_new
as of https://codereview.chromium.org/1323333002/
Android GN was blocking this roll due to a problem that ended up
being caused by a bug (http://crbug.com/534849).
Relevant changes:
* src/buildtools: f7310ee..8d89c1b
* src/third_party/boringssl/src: 1d128f3..4c60d35
* src/third_party/icu: 6b3ce81..423fc7e
* src/third_party/libjpeg_turbo: 631e2dd..e4e7503
* src/third_party/libvpx: ac1772e..70db223
* src/third_party/libyuv: fcacbfb..62c49dc
* src/tools/gyp: 5d01a8c..01528c7
* src/tools/swarming_client: 77f720b..6e5d2b2
Details: https://chromium.googlesource.com/chromium/src/+/310ea93..8cf53d6/DEPS
Clang version changed 245965:247874
Details: https://chromium.googlesource.com/chromium/src/+/310ea93..8cf53d6/tools/clang/scripts/update.sh
BUG=481034, 535973
TBR=marpan@webrtc.org
Review URL: https://codereview.webrtc.org/1355083002
Cr-Commit-Position: refs/heads/master@{#10101}
diff --git a/.gitignore b/.gitignore
index 55b4861..45a84f7 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 e524512..47ac5a6 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 573a455..7f46333 100644
--- a/chromium/.gclient
+++ b/chromium/.gclient
@@ -17,7 +17,6 @@
'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 44f3f07..99b5260 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -49,7 +49,7 @@
'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 5caa6cc..7b17d43 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 5173b33..b9c8f0b 100644
--- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
+++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
@@ -27,7 +27,7 @@
"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 b93bc5e..261e9d7 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -117,6 +117,6 @@
# 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 adf1624..38c1c04 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 c92509c..a60a476 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 ac7e67a..752521c 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', {