Roll chromium_revision 3462a5bab8..f1db52a3a2 (1408687:1419760)
Change log: https://chromium.googlesource.com/chromium/src/+log/3462a5bab8..f1db52a3a2
Full diff: https://chromium.googlesource.com/chromium/src/+/3462a5bab8..f1db52a3a2
Changed dependencies
* fuchsia_version: version:26.20250117.5.1..version:27.20250207.1.1
* reclient_version: re_client_version:0.174.0.d516e7c7-gomaip..re_client_version:0.176.0.8c46330a-gomaip
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/e0914b7606..ca242a57cf
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/64e296c42a..f17c190e2f
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/a660247d3c..0a1094876d
* src/buildtools/reclient: re_client_version:0.174.0.d516e7c7-gomaip..re_client_version:0.176.0.8c46330a-gomaip
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/f83303423a..1a23049883
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/63412fdcdf..51e4002c7a
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/d212a71416..77cac2bb91
* src/third_party/android_build_tools/error_prone/cipd: Q3oiuVxuq1jkWhjfnfCSviXK8BbbB9n6_4jz3x_Mo3kC..dziQrHcY5ab_raj9-Yp5nx3-aF-RO-0lebRXxaVJshoC
* src/third_party/android_build_tools/manifest_merger/cipd: yd6w2zQr48NAkrzrzEj2OmMzI-kANsmD6lvKhfXluAsC..G4w2G_1QzMYzXg-L-pGb7jSsb_pNpy6LMkwjkB5INuUC
* src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework: version:2@4.1.1.cr1..version:2@4.0.0.cr1
* src/third_party/android_deps/cipd/libs/com_squareup_wire_wire_runtime_jvm: version:2@5.0.0.cr1..version:2@5.2.1.cr1
* src/third_party/android_sdk/public: OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C..bCFMX8oYIRJ_tP3tzaPcTKNqOAVdNk5TV_cwMp3GmE8C
* src/third_party/androidx/cipd: VWuP17o8bAsMqJ5b_3fu60qkAIWd905hpPI83flbNrMC..VLxr-_SaALj_agakQU7SI5mk6dbXtGG-GSNVxRhcSQIC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/d4b6eb542d..285228fdfb
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b15611f18b..1961d07624
* src/third_party/dav1d/libdav1d: https://chromium.googlesource.com/external/github.com/videolan/dav1d.git/+log/edb16889d1..42b2b24fb8
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/80d1969422..664154a905
* src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/d10a0f8bf5..5b22c2869c
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/a059b237bb..b1f4785087
* src/third_party/fuzztest/src: https://chromium.googlesource.com/external/github.com/google/fuzztest.git/+log/00edfa0dd9..73356f7497
* src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/2b6b042a77..c00fd25b71
* src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/1c249be96e..8efd2d85c7
* src/third_party/kotlin_stdlib/cipd: z7NenFzvjmGieRhzC5IhUKe-nO3U6xA5VwUilO3GZLgC..Uqhh8PWKv02Noc93yJfD44-b0MoILn5G4-NDFj2vzTUC
* src/third_party/kotlinc/current: VgYl1YO2AM2qu-RYvdko61h4YtNnJeZlGWWppX7vJq8C..NstbMU2T3FwNigAPukklSBBmCKyUGheEgy8WZNY-5WIC
* src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/d737ca3ebe..af629abd92
* src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/2e25154d49..c4e58f47f4
* src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/8205ccf0f2..94c5d7a8ed
* src/third_party/libunwind/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/e55d8cf51c..4337c9955a
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/7a65480684..2bfb9f9e0a
* src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/10592b60c0..ccdf870348
* src/third_party/llvm-libc/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git/+log/12809bfa85..9b047228d2
* src/third_party/openh264/src: https://chromium.googlesource.com/external/github.com/cisco/openh264/+log/478e5ab3ec..33f7f48613
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/a0c2bc7919..23b2b69407
* src/third_party/protobuf-javascript/src: https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript/+log/e34549db51..426b2e025a
* src/third_party/r8/cipd: DJU_YH-xmuJ4kRnli6eXC-q9Q21-GPFj4YVZyAqKSWoC..HQpB5qnvqJaa7mYuDfdaMA8jAXGIoYH-3x90feqF9tAC
* src/third_party/r8/d8/cipd: U3Jf_ewWOZyxa6vyO3wjNIgm8XIz1yFk-4k3-wqDL44C..ukddmPlorF_6XXPBcxDxCmK2PSAJlhu_MDUhZQCz1l8C
* src/third_party/rust-toolchain_version: Linux_x64/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Mac/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Mac_arm64/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Win/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz..Linux_x64/rust-toolchain-d4bdd1ed551fed0c951eb47b4be2c79d7a02d181-1-llvmorg-21-init-853-gba476d0b.tar.xz,Mac/rust-toolchain-d4bdd1ed551fed0c951eb47b4be2c79d7a02d181-1-llvmorg-21-init-853-gba476d0b.tar.xz,Mac_arm64/rust-toolchain-d4bdd1ed551fed0c951eb47b4be2c79d7a02d181-1-llvmorg-21-init-853-gba476d0b.tar.xz,Win/rust-toolchain-d4bdd1ed551fed0c951eb47b4be2c79d7a02d181-1-llvmorg-21-init-853-gba476d0b.tar.xz
* src/third_party/zstd/src: https://chromium.googlesource.com/external/github.com/facebook/zstd.git/+log/80af41e08a..ef2bf57811
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/6820cc03cc..d417d8dc2f
* src/tools/luci-go: git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956..git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48
* src/tools/luci-go: git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956..git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48
* src/tools/luci-go: git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956..git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48
DEPS diff: https://chromium.googlesource.com/chromium/src/+/3462a5bab8..f1db52a3a2/DEPS
Clang version changed llvmorg-20-init-17108-g29ed6000:llvmorg-21-init-853-gba476d0b
Details: https://chromium.googlesource.com/chromium/src/+/3462a5bab8..f1db52a3a2/tools/clang/scripts/update.py
BUG=None
Change-Id: Iec527c6be69f2b2bcd54cd01bd11a4904ca51c6a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/377120
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43888}
diff --git a/BUILD.gn b/BUILD.gn
index 253f5d0..5725435 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -138,7 +138,7 @@
# Contains the defines and includes in common.gypi that are duplicated both as
# target_defaults and direct_dependent_settings.
config("common_inherited_config") {
- defines = []
+ defines = [ "PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0" ]
cflags = []
ldflags = []
diff --git a/DEPS b/DEPS
index 576160f..8c4b451 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
- 'chromium_revision': '3462a5bab8ba8c0989f448c56ff055cd4a0a5c89',
+ 'chromium_revision': 'f1db52a3a2dbf52a80c4fbb0d88bba054f2d7326',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with
@@ -33,7 +33,7 @@
# By default, download the fuchsia sdk from the public sdk directory.
'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/',
- 'fuchsia_version': 'version:26.20250117.5.1',
+ 'fuchsia_version': 'version:27.20250207.1.1',
# By default, download the fuchsia images from the fuchsia GCS bucket.
'fuchsia_images_bucket': 'fuchsia',
'checkout_fuchsia': False,
@@ -48,7 +48,7 @@
# RBE instance to use for running remote builds
'rbe_instance': 'projects/rbe-webrtc-developer/instances/default_instance',
# reclient CIPD package version
- 'reclient_version': 're_client_version:0.174.0.d516e7c7-gomaip',
+ 'reclient_version': 're_client_version:0.176.0.8c46330a-gomaip',
# ninja CIPD package.
'ninja_package': 'infra/3pp/tools/ninja/',
@@ -64,24 +64,24 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@e0914b7606a151a3a12e994c400519f2e291c53f',
+ 'https://chromium.googlesource.com/chromium/src/base@ca242a57cf6c8297d0dae4b678e97a8557106792',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@64e296c42a93fbd27acc9a94713e4289273409b2',
+ 'https://chromium.googlesource.com/chromium/src/build@f17c190e2fdf492df18bcd3a51a6923251d27772',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@a660247d3c14a172b74b8e832ba1066b30183c97',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@0a1094876d08c34dc428729477278fda7b0ac880',
# 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@f83303423aeb21536cf8f913540b0ece28bc778a',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@1a2304988385f3a966d4fde5021fa630adb4d61a',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@63412fdcdfe281e6b9531a5e1086a59c0b9e6909',
+ 'https://chromium.googlesource.com/chromium/src/testing@51e4002c7a1987d66ff25f5c2bc0e4ce6d8163a8',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@d212a71416ad7c6ceca04d6d27dfdd84fd00c04c',
+ 'https://chromium.googlesource.com/chromium/src/third_party@77cac2bb91711b8f1560f2b775138fb2bf7af3ff',
'src/buildtools/linux64': {
'packages': [
@@ -164,13 +164,13 @@
'src/third_party/clang-format/script':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@37f6e68a107df43b7d7e044fd36a13cbae3413f2',
'src/third_party/libc++/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@2e25154d49c29fa9aa42c30ad4a027bd30123434',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@c4e58f47f43df8c6e80d8727aadf5feb57c2a32b',
'src/third_party/libc++abi/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@8205ccf0f23545ebcd8846363ea1d29e77917a22',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@94c5d7a8edc09f0680aee57548c0b5d400c2840d',
'src/third_party/llvm-libc/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git@12809bfa855813dcef51871e2ee3155e53ed35ea',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git@9b047228d2b26329f224a67d0e19ecb17b4b3636',
'src/third_party/libunwind/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@e55d8cf51c6db1fdd4bb56c158945ec59772c8ee',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@4337c9955a37b3f2a7b105fd19a2fb82bf9bf5af',
'src/third_party/test_fonts/test_fonts': {
'dep_type': 'gcs',
@@ -244,7 +244,7 @@
'packages': [
{
'package': 'chromium/third_party/android_build_tools/error_prone',
- 'version': 'Q3oiuVxuq1jkWhjfnfCSviXK8BbbB9n6_4jz3x_Mo3kC',
+ 'version': 'dziQrHcY5ab_raj9-Yp5nx3-aF-RO-0lebRXxaVJshoC',
},
],
'condition': 'checkout_android',
@@ -286,11 +286,11 @@
},
'src/third_party/boringssl/src':
- 'https://boringssl.googlesource.com/boringssl.git@d4b6eb542d4fd109baacd550935efd00c521e674',
+ 'https://boringssl.googlesource.com/boringssl.git@285228fdfb93c0a11c4f2f219fbf3ec0b1481872',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@0dfd77492fdb0dcd06027c5842095e2e908adc90',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@b15611f18b506cf9dbc03e9bf87dbc8df549ccce',
+ 'https://chromium.googlesource.com/catapult.git@1961d076242d7006e8c55893dcda4f0121994c47',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -303,9 +303,9 @@
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@d3d60ac6e0f16780bcfcc825385e1d338801a558',
'src/third_party/depot_tools':
- 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@80d1969422e75e8e9eecafa46074074b289e2568',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@664154a905e1abdcb8512a1f587e912a3d72d516',
'src/third_party/ffmpeg':
- 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@d10a0f8bf5ddcce572df95105152bc74041cae0c',
+ 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@5b22c2869c0e710bd2a2312240790a013a060c23',
'src/third_party/flatbuffers/src':
'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@8db59321d9f02cdffa30126654059c7d02f70c32',
'src/third_party/grpc/src': {
@@ -317,9 +317,9 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@a059b237bb01eb3e4f9f8b1618dda8c117498bab',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@b1f47850878d232eea372ab167e760ccac4c4e32',
'src/third_party/harfbuzz-ng/src':
- 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@1c249be96e27eafd15eb86d832b67fbc3751634b',
+ 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@8efd2d85c78fbba6ca09a3e454f77525f3b296ce',
'src/third_party/google_benchmark/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@761305ec3b33abf30e08d50eb829e19a802581cc',
},
@@ -331,18 +331,19 @@
'condition': 'checkout_android',
},
'src/third_party/googletest/src':
- 'https://chromium.googlesource.com/external/github.com/google/googletest.git@2b6b042a77446ff322cd7522ca068d9f2a21c1d1',
+ 'https://chromium.googlesource.com/external/github.com/google/googletest.git@c00fd25b71a17e645e4567fcb465c3fa532827d2',
'src/third_party/icu': {
'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@bbccc2f6efc1b825de5f2c903c48be685cd0cf22',
},
'src/third_party/jdk/current': {
'packages': [
{
- 'package': 'chromium/third_party/jdk',
- 'version': 'G-WIGWdFIBTPPhv2xPK_lTfI5N7WmfCBh0oTKqX-c5sC',
+ 'package': 'chromium/third_party/jdk/linux-amd64',
+ 'version': '2iiuF-nKDH3moTImx2op4WTRetbfhzKoZhH7Xo44zGsC',
},
- ],
- 'condition': 'host_os == "linux" and checkout_android',
+ ],
+ # Needed on Linux for use on chromium_presubmit (for checkstyle).
+ 'condition': '(checkout_android or checkout_linux) and non_git_source',
'dep_type': 'cipd',
},
# Deprecated - only use for tools which are broken real JDK.
@@ -368,7 +369,7 @@
'packages': [
{
'package': 'chromium/third_party/kotlin_stdlib',
- 'version': 'z7NenFzvjmGieRhzC5IhUKe-nO3U6xA5VwUilO3GZLgC',
+ 'version': 'Uqhh8PWKv02Noc93yJfD44-b0MoILn5G4-NDFj2vzTUC',
},
],
'condition': 'checkout_android',
@@ -379,7 +380,7 @@
'packages': [
{
'package': 'chromium/third_party/kotlinc',
- 'version': 'VgYl1YO2AM2qu-RYvdko61h4YtNnJeZlGWWppX7vJq8C',
+ 'version': 'NstbMU2T3FwNigAPukklSBBmCKyUGheEgy8WZNY-5WIC',
},
],
'condition': 'checkout_android',
@@ -388,27 +389,27 @@
'src/third_party/libFuzzer/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git@e31b99917861f891308269c36a32363b120126bb',
'src/third_party/fuzztest/src':
- 'https://chromium.googlesource.com/external/github.com/google/fuzztest.git@00edfa0dd94d7e00a89684e950015c30d3b7ae07',
+ 'https://chromium.googlesource.com/external/github.com/google/fuzztest.git@73356f7497fd968c9568314a6017ab84bd13d931',
'src/third_party/libjpeg_turbo':
'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@927aabfcd26897abb9776ecf2a6c38ea5bb52ab6',
'src/third_party/libsrtp':
'https://chromium.googlesource.com/chromium/deps/libsrtp.git@a52756acb1c5e133089c798736dd171567df11f5',
'src/third_party/dav1d/libdav1d':
- 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@edb16889d16f5e13161b6e8f7a839cd82d7d655d',
+ 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa',
'src/third_party/libaom/source/libaom':
- 'https://aomedia.googlesource.com/aom.git@d737ca3ebe92feec465876a8fc98950cecd08fd8',
+ 'https://aomedia.googlesource.com/aom.git@af629abd92b7247e5d8c678e294d68bbefc53dc4',
'src/third_party/libunwindstack': {
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@e5061bbda4c2ba6438020669ed06b122032433dd',
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@a0c2bc7919f7467cf4a8287c8389c3f96a3fcbac',
+ 'https://android.googlesource.com/platform/external/perfetto.git@23b2b694071ff2b7dc8f5f381552c63840b1af11',
'src/third_party/protobuf-javascript/src':
- Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295',
+ Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + '426b2e025aa59c23a1b6e19fbacd6b4a11bfad16',
'src/third_party/libvpx/source/libvpx':
- 'https://chromium.googlesource.com/webm/libvpx.git@7a65480684b1b28bb9defae164bf0dc78b32653e',
+ 'https://chromium.googlesource.com/webm/libvpx.git@2bfb9f9e0a9cca18cd5a0045e931b49dac390c79',
'src/third_party/libyuv':
- 'https://chromium.googlesource.com/libyuv/libyuv.git@10592b60c0b2c33210b7752454253dc2625b4305',
+ 'https://chromium.googlesource.com/libyuv/libyuv.git@ccdf870348764e4b77fa3b56accb2a896a901bad',
'src/third_party/lss': {
'url': 'https://chromium.googlesource.com/linux-syscall-support.git@ce877209e11aa69dcfffbd53ef90ea1d07136521',
'condition': 'checkout_android or checkout_linux',
@@ -428,7 +429,7 @@
},
'src/third_party/openh264/src':
- 'https://chromium.googlesource.com/external/github.com/cisco/openh264@478e5ab3eca30e600006d5a0a08b176fd34d3bd1',
+ 'https://chromium.googlesource.com/external/github.com/cisco/openh264@33f7f48613258446decb33b3575fc0a3c9ed14e3',
'src/third_party/re2/src':
'https://chromium.googlesource.com/external/github.com/google/re2.git@6dcd83d60f7944926bfd308cc13979fc53dd69ca',
@@ -437,7 +438,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'DJU_YH-xmuJ4kRnli6eXC-q9Q21-GPFj4YVZyAqKSWoC',
+ 'version': 'HQpB5qnvqJaa7mYuDfdaMA8jAXGIoYH-3x90feqF9tAC',
},
],
'condition': 'checkout_android',
@@ -450,7 +451,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'U3Jf_ewWOZyxa6vyO3wjNIgm8XIz1yFk-4k3-wqDL44C',
+ 'version': 'ukddmPlorF_6XXPBcxDxCmK2PSAJlhu_MDUhZQCz1l8C',
},
],
'condition': 'checkout_android',
@@ -461,7 +462,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@6820cc03cc8a4b1fb99747f30e8249d138a70981',
+ 'https://chromium.googlesource.com/chromium/src/tools@d417d8dc2f14a207b41ff7a9b424fbb75cbaa5f0',
'src/third_party/espresso': {
'packages': [
@@ -500,7 +501,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': 'VWuP17o8bAsMqJ5b_3fu60qkAIWd905hpPI83flbNrMC',
+ 'version': 'VLxr-_SaALj_agakQU7SI5mk6dbXtGG-GSNVxRhcSQIC',
},
],
'condition': 'checkout_android and non_git_source',
@@ -511,7 +512,7 @@
'packages': [
{
'package': 'chromium/third_party/android_build_tools/manifest_merger',
- 'version': 'yd6w2zQr48NAkrzrzEj2OmMzI-kANsmD6lvKhfXluAsC',
+ 'version': 'G4w2G_1QzMYzXg-L-pGb7jSsb_pNpy6LMkwjkB5INuUC',
},
],
'condition': 'checkout_android',
@@ -538,7 +539,7 @@
},
{
'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
- 'version': 'OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C',
+ 'version': 'bCFMX8oYIRJ_tP3tzaPcTKNqOAVdNk5TV_cwMp3GmE8C',
},
],
'condition': 'checkout_android',
@@ -590,7 +591,7 @@
},
'src/third_party/zstd/src': {
- 'url': Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '80af41e08a630946a75a5cda9e4cdf192247f20a',
+ 'url': Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + 'ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f',
'condition': 'checkout_android',
},
@@ -598,15 +599,15 @@
'packages': [
{
'package': 'infra/tools/luci/cas/${{platform}}',
- 'version': 'git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956',
+ 'version': 'git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48',
},
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956',
+ 'version': 'git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:e3703a4d1c29e8355653c19b59b0aa793a850956',
+ 'version': 'git_revision:19861b3a5b37b383e7e9555e11aa43f34d71bd48',
}
],
'dep_type': 'cipd',
@@ -679,7 +680,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework',
- 'version': 'version:2@4.1.1.cr1',
+ 'version': 'version:2@4.0.0.cr1',
},
],
'condition': 'checkout_android and non_git_source',
@@ -1306,7 +1307,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm',
- 'version': 'version:2@5.0.0.cr1',
+ 'version': 'version:2@5.2.1.cr1',
},
],
'condition': 'checkout_android and non_git_source',
diff --git a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
index d7c1905..dcc79b1 100644
--- a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
+++ b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
@@ -148,9 +148,9 @@
@Test
public void testBluetoothDefaultStartStopStates() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
bluetoothManager.stop();
- assertEquals(bluetoothManager.getState(), State.UNINITIALIZED);
+ assertEquals(State.UNINITIALIZED, bluetoothManager.getState());
}
// Verify correct state after receiving BluetoothServiceListener.onServiceConnected()
@@ -158,10 +158,10 @@
@Test
public void testBluetoothServiceListenerConnectedWithNoHeadset() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
simulateBluetoothServiceConnectedWithNoConnectedHeadset();
verify(mockedAppRtcAudioManager, times(1)).updateAudioDeviceState();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
}
// Verify correct state after receiving BluetoothServiceListener.onServiceConnected()
@@ -170,20 +170,20 @@
@Test
public void testBluetoothServiceListenerConnectedWithHeadset() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
simulateBluetoothServiceConnectedWithConnectedHeadset();
verify(mockedAppRtcAudioManager, times(1)).updateAudioDeviceState();
- assertEquals(bluetoothManager.getState(), State.HEADSET_AVAILABLE);
+ assertEquals(State.HEADSET_AVAILABLE, bluetoothManager.getState());
}
// Verify correct state after receiving BluetoothProfile.ServiceListener.onServiceDisconnected().
@Test
public void testBluetoothServiceListenerDisconnected() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
simulateBluetoothServiceDisconnected();
verify(mockedAppRtcAudioManager, times(1)).updateAudioDeviceState();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
}
// Verify correct state after BluetoothServiceListener.onServiceConnected() and
@@ -193,11 +193,11 @@
@Test
public void testBluetoothHeadsetConnected() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
simulateBluetoothServiceConnectedWithConnectedHeadset();
simulateBluetoothHeadsetConnected();
verify(mockedAppRtcAudioManager, times(2)).updateAudioDeviceState();
- assertEquals(bluetoothManager.getState(), State.HEADSET_AVAILABLE);
+ assertEquals(State.HEADSET_AVAILABLE, bluetoothManager.getState());
}
// Verify correct state sequence for a case when a BT headset is available,
@@ -205,18 +205,18 @@
@Test
public void testBluetoothScoAudioStartAndStop() {
bluetoothManager.start();
- assertEquals(bluetoothManager.getState(), State.HEADSET_UNAVAILABLE);
+ assertEquals(State.HEADSET_UNAVAILABLE, bluetoothManager.getState());
simulateBluetoothServiceConnectedWithConnectedHeadset();
- assertEquals(bluetoothManager.getState(), State.HEADSET_AVAILABLE);
+ assertEquals(State.HEADSET_AVAILABLE, bluetoothManager.getState());
bluetoothManager.startScoAudio();
- assertEquals(bluetoothManager.getState(), State.SCO_CONNECTING);
+ assertEquals(State.SCO_CONNECTING, bluetoothManager.getState());
simulateBluetoothScoConnectionConnected();
- assertEquals(bluetoothManager.getState(), State.SCO_CONNECTED);
+ assertEquals(State.SCO_CONNECTED, bluetoothManager.getState());
bluetoothManager.stopScoAudio();
simulateBluetoothScoConnectionDisconnected();
- assertEquals(bluetoothManager.getState(), State.SCO_DISCONNECTING);
+ assertEquals(State.SCO_DISCONNECTING,bluetoothManager.getState());
bluetoothManager.stop();
- assertEquals(bluetoothManager.getState(), State.UNINITIALIZED);
+ assertEquals(State.UNINITIALIZED, bluetoothManager.getState());
verify(mockedAppRtcAudioManager, times(3)).updateAudioDeviceState();
}
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
index f097df2..5ec5aae 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
@@ -169,7 +169,7 @@
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
@SuppressWarnings("NoSynchronizedMethodCheck")
public synchronized void onSignalingChange(SignalingState newState) {
- assertEquals(expectedSignalingChanges.remove(), newState);
+ assertEquals(newState, expectedSignalingChanges.remove());
}
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
@@ -199,7 +199,7 @@
return;
}
- assertEquals(expectedIceConnectionChanges.remove(), newState);
+ assertEquals(newState, expectedIceConnectionChanges.remove());
}
@Override
@@ -215,7 +215,7 @@
return;
}
- assertEquals(expectedStandardizedIceConnectionChanges.remove(), newState);
+ assertEquals(newState, expectedStandardizedIceConnectionChanges.remove());
}
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
@@ -233,7 +233,7 @@
return;
}
- assertEquals(expectedConnectionChanges.remove(), newState);
+ assertEquals(newState, expectedConnectionChanges.remove());
}
@Override
@@ -262,7 +262,7 @@
if (expectedIceGatheringChanges.isEmpty()) {
Logging.d(TAG, name + "Got an unexpected ICE gathering change " + newState);
}
- assertEquals(expectedIceGatheringChanges.remove(), newState);
+ assertEquals(newState, expectedIceGatheringChanges.remove());
}
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
index 9781d03..3b8a73c 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
@@ -124,8 +124,8 @@
// `surfaceTextureHelper` as the target EGLSurface.
final EglBase eglOesBase = EglBase.create(eglBase.getEglBaseContext(), EglBase.CONFIG_PLAIN);
eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
- assertEquals(eglOesBase.surfaceWidth(), width);
- assertEquals(eglOesBase.surfaceHeight(), height);
+ assertEquals(width, eglOesBase.surfaceWidth());
+ assertEquals(height, eglOesBase.surfaceHeight());
final int red[] = new int[] {79, 144, 185};
final int green[] = new int[] {66, 210, 162};
@@ -155,10 +155,10 @@
// Assert rendered image is expected constant color.
while (rgbaData.hasRemaining()) {
- assertEquals(rgbaData.get() & 0xFF, red[i]);
- assertEquals(rgbaData.get() & 0xFF, green[i]);
- assertEquals(rgbaData.get() & 0xFF, blue[i]);
- assertEquals(rgbaData.get() & 0xFF, 255);
+ assertEquals(red[i], rgbaData.get() & 0xFF);
+ assertEquals(green[i], rgbaData.get() & 0xFF);
+ assertEquals(blue[i], rgbaData.get() & 0xFF);
+ assertEquals(255, rgbaData.get() & 0xFF);
}
}
@@ -192,8 +192,8 @@
// `surfaceTextureHelper` as the target EGLSurface.
final EglBase eglOesBase = EglBase.create(eglBase.getEglBaseContext(), EglBase.CONFIG_PLAIN);
eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
- assertEquals(eglOesBase.surfaceWidth(), width);
- assertEquals(eglOesBase.surfaceHeight(), height);
+ assertEquals(width, eglOesBase.surfaceWidth());
+ assertEquals(height, eglOesBase.surfaceHeight());
final int red = 79;
final int green = 66;
@@ -227,10 +227,10 @@
// Assert rendered image is expected constant color.
while (rgbaData.hasRemaining()) {
- assertEquals(rgbaData.get() & 0xFF, red);
- assertEquals(rgbaData.get() & 0xFF, green);
- assertEquals(rgbaData.get() & 0xFF, blue);
- assertEquals(rgbaData.get() & 0xFF, 255);
+ assertEquals(red, rgbaData.get() & 0xFF);
+ assertEquals(green, rgbaData.get() & 0xFF);
+ assertEquals(blue, rgbaData.get() & 0xFF);
+ assertEquals(255,rgbaData.get() & 0xFF);
}
// Late frame return after everything has been disposed and released.
textureBuffer.release();
@@ -447,8 +447,8 @@
// `surfaceTextureHelper` as the target EGLSurface.
eglBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
- assertEquals(eglBase.surfaceWidth(), width);
- assertEquals(eglBase.surfaceHeight(), height);
+ assertEquals(width, eglBase.surfaceWidth());
+ assertEquals(height, eglBase.surfaceHeight());
final int red[] = new int[] {79, 144, 185};
final int green[] = new int[] {66, 210, 162};
diff --git a/webrtc.gni b/webrtc.gni
index c5eeba5..e33d529 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -531,6 +531,7 @@
webrtc_root + "sdk/android:base_java",
webrtc_root + "test:native_test_java",
webrtc_root + "test:native_test_support",
+ "//third_party/jni_zero:jni_zero_java",
]
}
@@ -1242,6 +1243,7 @@
"suppressed_configs",
"visibility",
])
+ deps += [ "//third_party/jni_zero:jni_zero_java" ]
}
}
}
