mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Roll chromium_revision 867b87eb29..b56d8868f3 (933713:941610)

Browse source 
Change log: 867b87eb29..b56d8868f3
Full diff: 867b87eb29..b56d8868f3

Changed dependencies
* src/base: 14c89123e6..b367343820
* src/build: a0368daa25..d134d68f00
* src/buildtools: aa2fb0187c..b138e6ce86
* src/buildtools/linux64: git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148..git_revision:90294ccdcf9334ed25a76ac9b67689468e506342
* src/buildtools/mac: git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148..git_revision:90294ccdcf9334ed25a76ac9b67689468e506342
* src/buildtools/third_party/libc++abi/trunk: 4c834abe6f..707d75f53e
* src/buildtools/third_party/libunwind/trunk: 10f4e4a5b5..51ffc5ed5c
* src/buildtools/win: git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148..git_revision:90294ccdcf9334ed25a76ac9b67689468e506342
* src/ios: eb1001b206..af72ede971
* src/testing: 650a2f9467..619bca0ef9
* src/third_party: bc52b47596..5f94f37f8c
* src/third_party/android_build_tools/aapt2: oJ_fhfmT6sLorimH6Eo6hwWS2R2gU0c4ZUQfXvzae1UC..GlCdqxHxlg-8YkDGgj5cie-6COsEAZga9jyq-LAYxY4C
* src/third_party/android_build_tools/bundletool: OZ4is33usuZy-deP3FpWCtbKXaIY0qBLsElWte7556YC..2ZcLVDxyRwp8FzpeYLtLT0TfSRweZxvwh1-Kx1jZ_FoC
* src/third_party/android_deps/libs/com_google_android_material_material: version:2@1.5.0-alpha02.cr0..version:2@1.5.0-alpha05.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation: version:2@2.9.0.cr0..version:2@2.10.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations: version:2@2.9.0.cr0..version:2@2.10.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api: version:2@2.9.0.cr0..version:2@2.10.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_core: version:2@2.9.0.cr0..version:2@2.10.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations: version:2@2.9.0.cr0..version:2@2.10.0.cr0
* src/third_party/androidx: Dewv4glpYqPtnvaOzHgVF6074yDsYzzDFiv0dO1ijwgC..nCX115noKlFOaRMhmFKd1v01hnVpUAaKg2SyLFZaYZgC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/45c8be91f3..69030a0cea
* src/third_party/breakpad/breakpad: ff5892c5da..ee2ad61263
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2d036344bd..a7ad5b5c96
* src/third_party/depot_tools: 5cffc195c9..9fcfde2499
* src/third_party/freetype/src: fde91ab8f1..d31bafcb9c
* src/third_party/googletest/src: 16f637fbf4..1b18723e87
* src/third_party/icu: eedbaf76e4..3e05d9daa9
* src/third_party/libvpx/source/libvpx: 7aabd69682..e259e6951d
* src/third_party/perfetto: 844b8662e9..5ed467a290
* src/third_party/r8: EU82Aqeu2B1PZzAmebHXfyOgeL2UZifcIJ1LPyoThw0C..nqWomZTwNDoogX26WeCSoFGg6aQN1FrwzoU4hCS0duEC
* src/third_party/turbine: 6QYCyqU5yXkAT7T-_K3sCPvfISI8ACXF_cW4OM5v9BgC..KbLQUR_KFiUEzVt1lMTORY96bz_PbMwC3GwIb1oGJmAC
* src/tools: f4333a2a39..a182115705
* src/tools/luci-go: git_revision:d1c03082ecda0148d8096f1fd8bf5491eafc7323..git_revision:0e76392e6557cc3ff8d95c3bc012540e0dbc128a
* src/tools/luci-go: git_revision:d1c03082ecda0148d8096f1fd8bf5491eafc7323..git_revision:0e76392e6557cc3ff8d95c3bc012540e0dbc128a
Added dependency
* src/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java
DEPS diff: 867b87eb29..b56d8868f3/DEPS

Clang version changed llvmorg-14-init-6722-g0fbd3aad:llvmorg-14-init-8564-g34b903d8
Details: 867b87eb29..b56d8868f3/tools/clang/scripts/update.py

TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,marpan@webrtc.org, jianj@chromium.org,
BUG=None

No-Presubmit: True
Change-Id: I721d681c6c0a687c782fa1f34ea6cea3fba6ce02
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237761
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35347}
This commit is contained in:
Mirko Bonadei 2021-11-15 15:41:28 +01:00 committed by WebRTC LUCI CQ
parent 21c4b1e9ca
commit f5ea3b96cd
4 changed files with 72 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gn
View file

@ -57,4 +57,7 @@ default_args = {
enable_libaom = true
gtest_enable_absl_printers = true
# Differently from Chromium, WebRTC still support SDK 21.
default_min_sdk_version = 21
}

81
DEPS
View file

@ -10,7 +10,7 @@ vars = {
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'chromium_revision': '867b87eb29a6ba69fefda9aee490860d6ebb9555',
'chromium_revision': 'b56d8868f3c9774579c57256865f85a57c05a6ae',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@ -23,30 +23,30 @@ deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
'https://chromium.googlesource.com/chromium/src/base@14c89123e6411b67aa8a76386924aea835b19bc0',
'https://chromium.googlesource.com/chromium/src/base@b3673438206172c67ca6c6c69b40885206d9ad42',
'src/build':
'https://chromium.googlesource.com/chromium/src/build@a0368daa2504b57a194a903a78f8cae4f23c94a1',
'https://chromium.googlesource.com/chromium/src/build@d134d68f005666f828f3e009186bc4707b6bb9df',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@aa2fb0187c2f7809263f66b6fb48d511a3223035',
'https://chromium.googlesource.com/chromium/src/buildtools@b138e6ce86ae843c42a1a08f37903207bebcca75',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3',
'condition': 'checkout_android',
},
'src/ios': {
'url': 'https://chromium.googlesource.com/chromium/src/ios@eb1001b2065857b5004286f025780cc9f10f6aca',
'url': 'https://chromium.googlesource.com/chromium/src/ios@af72ede971d2bc655e1fe1a9bb0d6b4a3b385290',
'condition': 'checkout_ios',
},
'src/testing':
'https://chromium.googlesource.com/chromium/src/testing@650a2f94676fff3fb6479ff37fc9ee7e853b6285',
'https://chromium.googlesource.com/chromium/src/testing@619bca0ef9567512ac6eae063f3c22524b6e57df',
'src/third_party':
'https://chromium.googlesource.com/chromium/src/third_party@bc52b47596a56f1bf812b8e0a6f30cf9d006b2df',
'https://chromium.googlesource.com/chromium/src/third_party@5f94f37f8cca887938d06288c33c46603c34c278',
'src/buildtools/linux64': {
'packages': [
{
'package': 'gn/gn/linux-amd64',
'version': 'git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148',
'version': 'git_revision:90294ccdcf9334ed25a76ac9b67689468e506342',
}
],
'dep_type': 'cipd',
@ -56,7 +56,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
'version': 'git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148',
'version': 'git_revision:90294ccdcf9334ed25a76ac9b67689468e506342',
}
],
'dep_type': 'cipd',
@ -66,7 +66,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/windows-amd64',
'version': 'git_revision:693f9fb87e4febdd4299db9f73d8d2c958e63148',
'version': 'git_revision:90294ccdcf9334ed25a76ac9b67689468e506342',
}
],
'dep_type': 'cipd',
@ -78,9 +78,9 @@ deps = {
'src/buildtools/third_party/libc++/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'src/buildtools/third_party/libc++abi/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@4c834abe6f3b58325aef9377a8675e5b4c097ebd',
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@707d75f53eaa379222bf6debee78344cd790fc9a',
'src/buildtools/third_party/libunwind/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@10f4e4a5b56e544a584f2ac7db1b5b380539b075',
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@51ffc5ed5cd9f28b064434bf2e55e1b6bb139a21',
'src/tools/clang/dsymutil': {
'packages': [
@ -117,7 +117,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/aapt2',
'version': 'oJ_fhfmT6sLorimH6Eo6hwWS2R2gU0c4ZUQfXvzae1UC',
'version': 'GlCdqxHxlg-8YkDGgj5cie-6COsEAZga9jyq-LAYxY4C',
},
],
'condition': 'checkout_android',
@ -128,7 +128,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/bundletool',
'version': 'OZ4is33usuZy-deP3FpWCtbKXaIY0qBLsElWte7556YC',
'version': '2ZcLVDxyRwp8FzpeYLtLT0TfSRweZxvwh1-Kx1jZ_FoC',
},
],
'condition': 'checkout_android',
@ -136,11 +136,11 @@ deps = {
},
'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@45c8be91f34741b140bcbfc4043795eb14669008',
'https://boringssl.googlesource.com/boringssl.git@69030a0ceabfe69c58cb2b83d9d4852333e3d0c2',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@ff5892c5da86c50af1951328215a5a3a203a9bb1',
'https://chromium.googlesource.com/breakpad/breakpad.git@ee2ad61263ebc54396df7d7a835e1e3f8455134e',
'src/third_party/catapult':
'https://chromium.googlesource.com/catapult.git@2d036344bd68fc41f8a07111db67b594fed4807b',
'https://chromium.googlesource.com/catapult.git@a7ad5b5c96b3ec2d70ea5c173a15ef45cacaf07a',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@ -149,7 +149,7 @@ deps = {
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools':
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@5cffc195c97a24add62b755abcd2720f58949147',
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@9fcfde249956f71b9acf8de6f195a347592a2e3f',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@731bf2abeb9e5d4fd02f6c7b8c743961130de5b0',
'src/third_party/findbugs': {
@ -162,7 +162,7 @@ deps = {
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@fde91ab8f19d1f789720afc67e0414a0244490d3',
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@d31bafcb9ce7dee7036089a394556ebf201221ec',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@9bd7ba5019381bb8584811ee63a0ba0cee7dca99',
'src/third_party/google_benchmark/src': {
@ -182,9 +182,9 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/googletest/src':
'https://chromium.googlesource.com/external/github.com/google/googletest.git@16f637fbf4ffc3f7a01fa4eceb7906634565242f',
'https://chromium.googlesource.com/external/github.com/google/googletest.git@1b18723e874b256c1e39378c6774a90701d70f7a',
'src/third_party/icu': {
'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@eedbaf76e49d28465d9119b10c30b82906e606ff',
'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@3e05d9daa98b765632fb5f79aa66f407efe1e262',
},
'src/third_party/jdk': {
'packages': [
@ -226,9 +226,9 @@ deps = {
'condition': 'checkout_android',
},
'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@844b8662e9cc73bf011a4920f9b1ffeb8ed5f681',
'https://android.googlesource.com/platform/external/perfetto.git@5ed467a2907bb3e252982db51a033bad81db1d09',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@7aabd6968278130da885f6c35ee12b19a1e7be72',
'https://chromium.googlesource.com/webm/libvpx.git@e259e6951d794ca6a6f2f3c9c40c5c99818613d3',
'src/third_party/libyuv':
'https://chromium.googlesource.com/libyuv/libyuv.git@d13d9d5972ec99e9f923ec5ca2afb8c1d21b8e5a',
'src/third_party/lss': {
@ -251,7 +251,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'EU82Aqeu2B1PZzAmebHXfyOgeL2UZifcIJ1LPyoThw0C',
'version': 'nqWomZTwNDoogX26WeCSoFGg6aQN1FrwzoU4hCS0duEC',
},
],
'condition': 'checkout_android',
@ -283,7 +283,7 @@ deps = {
'condition': 'checkout_win',
},
'src/tools':
'https://chromium.googlesource.com/chromium/src/tools@f4333a2a39daf8f7b971b8e6ec4f2c57561d1010',
'https://chromium.googlesource.com/chromium/src/tools@a1821157051922be957776936983d7ece6622431',
'src/third_party/accessibility_test_framework': {
'packages': [
@ -382,7 +382,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/androidx',
'version': 'Dewv4glpYqPtnvaOzHgVF6074yDsYzzDFiv0dO1ijwgC',
'version': 'nCX115noKlFOaRMhmFKd1v01hnVpUAaKg2SyLFZaYZgC',
},
],
'condition': 'checkout_android',
@ -476,7 +476,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/turbine',
'version': '6QYCyqU5yXkAT7T-_K3sCPvfISI8ACXF_cW4OM5v9BgC',
'version': 'KbLQUR_KFiUEzVt1lMTORY96bz_PbMwC3GwIb1oGJmAC',
},
],
'condition': 'checkout_android',
@ -487,11 +487,11 @@ deps = {
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
'version': 'git_revision:d1c03082ecda0148d8096f1fd8bf5491eafc7323',
'version': 'git_revision:0e76392e6557cc3ff8d95c3bc012540e0dbc128a',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
'version': 'git_revision:d1c03082ecda0148d8096f1fd8bf5491eafc7323',
'version': 'git_revision:0e76392e6557cc3ff8d95c3bc012540e0dbc128a',
},
],
'dep_type': 'cipd',
@ -1277,7 +1277,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material',
'version': 'version:2@1.5.0-alpha02.cr0',
'version': 'version:2@1.5.0-alpha05.cr0',
},
],
'condition': 'checkout_android',
@ -1420,7 +1420,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
'version': 'version:2@2.9.0.cr0',
'version': 'version:2@2.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -1431,7 +1431,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
'version': 'version:2@2.9.0.cr0',
'version': 'version:2@2.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -1442,7 +1442,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
'version': 'version:2@2.9.0.cr0',
'version': 'version:2@2.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -1453,7 +1453,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
'version': 'version:2@2.9.0.cr0',
'version': 'version:2@2.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -1464,7 +1464,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
'version': 'version:2@2.9.0.cr0',
'version': 'version:2@2.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -1614,6 +1614,17 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java',
'version': 'version:2@2.0.3.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': {
'packages': [
{

26
sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
View file

@ -224,11 +224,25 @@ TEST(Stacktrace, TestCurrentThread) {
<< "] not contained in: " << StackTraceToString(stack_trace);
}
TEST(Stacktrace, TestSpinLock) {
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
#ifdef WEBRTC_ARCH_ARM64
#define MAYBE_TestSpinLock DISABLED_TestSpinLock
#else
#define MAYBE_TestSpinLock TestSpinLock
#endif
TEST(Stacktrace, MAYBE_TestSpinLock) {
TestStacktrace(std::make_unique<SpinDeadlock>());
}
TEST(Stacktrace, TestSleep) {
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
#ifdef WEBRTC_ARCH_ARM64
#define MAYBE_TestSleep DISABLED_TestSleep
#else
#define MAYBE_TestSleep TestSleep
#endif
TEST(Stacktrace, MAYBE_TestSleep) {
TestStacktrace(std::make_unique<SleepDeadlock>());
}
@ -236,11 +250,15 @@ TEST(Stacktrace, TestSleep) {
// traces for ARM 32.
#ifdef WEBRTC_ARCH_ARM64
TEST(Stacktrace, TestRtcEvent) {
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
TEST(Stacktrace, DISABLED_TestRtcEvent) {
TestStacktrace(std::make_unique<RtcEventDeadlock>());
}
TEST(Stacktrace, TestRtcCriticalSection) {
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
TEST(Stacktrace, DISABLED_TestRtcCriticalSection) {
TestStacktrace(std::make_unique<RtcCriticalSectionDeadlock>());
}

1
tools_webrtc/libs/generate_licenses.py
View file

@ -61,6 +61,7 @@ LIB_TO_LICENSES_DICT = {
'libevent': ['base/third_party/libevent/LICENSE'],
'libjpeg_turbo': ['third_party/libjpeg_turbo/LICENSE.md'],
'libsrtp': ['third_party/libsrtp/LICENSE'],
'libunwind': ['buildtools/third_party/libunwind/trunk/LICENSE.TXT'],
'libvpx': ['third_party/libvpx/source/libvpx/LICENSE'],
'libyuv': ['third_party/libyuv/LICENSE'],
'nasm': ['third_party/nasm/LICENSE'],