admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This includes renaming back libvpx_new to libvpx in
https://codereview.chromium.org/1765703002

Add symlink to src/mojo as workaround while figuring out how to fix
this upstream in Chromium. See webrtc:5629.

Change log: ee31124..508edd3
Full diff: ee31124..508edd3

Changed dependencies:
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/6d49157..708db16
* src/third_party/libvpx_new/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/89cc682..None
* src/tools/swarming_client: https://chromium.googlesource.com/external/swarming.client.git/+log/a72f46e..df6e95e
DEPS diff: https://chromium.googlesource.com/chromium/src/+/ee31124..508edd3/DEPS

No update to Clang.

BUG=webrtc:5629
TBR=marpan@webrtc.org, stefan@webrtc.org,
NOTRY=True

Review URL: https://codereview.webrtc.org/1766643002

Cr-Commit-Position: refs/heads/master@{#11879}
This commit is contained in:
kjellander 2016-03-04 14:39:28 -08:00 committed by Commit bot
parent 6a4a03c59c
commit e26e78784b
9 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -47,6 +47,7 @@
/gyp-mac-tool
/links
/links.db
/mojo
/out
/resources/**/*.aecdump
/resources/**/*.bin
@ -103,7 +104,7 @@
/third_party/libjpeg
/third_party/libjpeg_turbo
/third_party/libsrtp
/third_party/libvpx_new
/third_party/libvpx
/third_party/libxml
/third_party/libudev
/third_party/libyuv

2
DEPS
View File

@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': 'ee311243eae6aef9c907543663754ff38f1f4f40',
'chromium_revision': '508edd3841b53f2f6063c6a6ef58f34a4e41e71c',
}
# NOTE: Use http rather than https; the latter can cause problems for users

3
setup_links.py
View File

@ -34,6 +34,7 @@ import textwrap
DIRECTORIES = [
'build',
'buildtools',
'mojo', # TODO(kjellander): Remove, see webrtc:5629.
'testing',
'third_party/binutils',
'third_party/boringssl',
@ -48,7 +49,7 @@ DIRECTORIES = [
'third_party/libjpeg_turbo',
'third_party/libsrtp',
'third_party/libudev',
'third_party/libvpx_new',
'third_party/libvpx',
'third_party/libyuv',
'third_party/llvm-build',
'third_party/lss',

2
webrtc/build/common.gypi
View File

@ -112,7 +112,7 @@
'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)',

2
webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
View File

@ -26,7 +26,7 @@ char kTSanDefaultSuppressions[] =
// Split up suppressions covered previously by thread.cc and messagequeue.cc.
"race:rtc::MessageQueue::Quit\n"
"race:vp8cx_remove_encoder_threads\n"
"race:third_party/libvpx_new/source/libvpx/vp9/common/vp9_scan.h\n"
"race:third_party/libvpx/source/libvpx/vp9/common/vp9_scan.h\n"
// Usage of trace callback and trace level is racy in rtc_media_unittests.
// https://code.google.com/p/webrtc/issues/detail?id=3372

2
webrtc/build/webrtc.gni
View File

@ -120,6 +120,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_new"
rtc_libvpx_dir = "//third_party/libvpx"
rtc_libyuv_dir = "//third_party/libyuv"
rtc_opus_dir = "//third_party/opus"

2
webrtc/modules/modules.gyp
View File

@ -446,7 +446,7 @@
}],
['build_libvpx==1', {
'dependencies': [
'<(libvpx_dir)/libvpx.gyp:libvpx_new',
'<(libvpx_dir)/libvpx.gyp:libvpx',
],
}],
['OS=="android"', {

2
webrtc/modules/video_coding/codecs/vp8/vp8.gyp
View File

@ -23,7 +23,7 @@
'conditions': [
['build_libvpx==1', {
'dependencies': [
'<(libvpx_dir)/libvpx.gyp:libvpx_new',
'<(libvpx_dir)/libvpx.gyp:libvpx',
],
}],
],

2
webrtc/modules/video_coding/codecs/vp9/vp9.gyp
View File

@ -17,7 +17,7 @@
'conditions': [
['build_libvpx==1', {
'dependencies': [
'<(libvpx_dir)/libvpx.gyp:libvpx_new',
'<(libvpx_dir)/libvpx.gyp:libvpx',
],
}],
],