diff --git a/DEPS b/DEPS index f66953e612..c6c32f11d6 100644 --- a/DEPS +++ b/DEPS @@ -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': 'ccf648df915eadad3d27653c32709dfc5b3e5254', + 'chromium_revision': 'aa68dfe99718b74eee443084496b9d94b80d5f51', # Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to # process the raw profiles produced by instrumented targets (built with @@ -45,7 +45,7 @@ vars = { # 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.164.0.76480e37-gomaip', + 'reclient_version': 're_client_version:0.168.0.c46e68bc-gomaip', # ninja CIPD package. 'ninja_package': 'infra/3pp/tools/ninja/', @@ -61,24 +61,24 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@006d78d70b321239c8953bec055e37638e04d900', + 'https://chromium.googlesource.com/chromium/src/base@68128fa0f006398c1faf8dc60508acdc6316c83a', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@f2790bfa3238410fbb4bb74b6282f6edb3c1e089', + 'https://chromium.googlesource.com/chromium/src/build@6d08a23c995ea495b6601afc73742b550d91dafd', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@0a905dcb6d88dbfe4b9b169bf367da9371f72ae3', + 'https://chromium.googlesource.com/chromium/src/buildtools@754803453c167d8d4821155cb7fb407ae37aacd8', # 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@26dfb6e15c33512e9ce695d5ed9ea8bcfc2ef8ce', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@53b28a3235e7ce23bca82cb4df0c39f7f50ca290', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@3ef5641e1fbbd8fbf2fba9fb0aac929dc3b04d97', + 'https://chromium.googlesource.com/chromium/src/testing@b6f87cfcfbd58a20c99ab5cdd08c45672b1229aa', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@c8056c18ac5999093ce3c9aa25286d6787e9c6d0', + 'https://chromium.googlesource.com/chromium/src/third_party@512db14abf893f88fd99df2a41be6616336f8447', 'src/buildtools/linux64': { 'packages': [ @@ -126,9 +126,9 @@ deps = { 'src/third_party/clang-format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@3c0acd2d4e73dd911309d9e970ba09d58bf23a62', 'src/third_party/libc++/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@f1144730714608f01d6904037977dce8c15a49b7', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@283f1aa1ad5758f7cb9778692a8b3c881ca25e6a', 'src/third_party/libc++abi/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@829f51051ce2b51be14f7853cca71be98083df6b', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@975ef56df0f09388b3012b51e8c57bb1fd4a57c0', 'src/third_party/libunwind/src': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@71735e82a6fda4af58f68b9028a7c5ac49898884', @@ -204,7 +204,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/error_prone', - 'version': '15eqqvDTRtPu1Sy8b4WuOiqkivE9ibCjSdoOtqJYyBEC', + 'version': 'hUxlP8GvC1xhmZ6r9xjYau2laPlzHbs_P2emx4ZL4jgC', }, ], 'condition': 'checkout_android', @@ -234,7 +234,7 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@fa0214602cc5502c2d1e12cc4692d1045a993aba', + 'https://boringssl.googlesource.com/boringssl.git@905c3903fd4291a22328346861ddf15599a7c33b', 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@6b0c5b7ee1988a14a4af94564e8ae8bba8a94374', 'src/third_party/catapult': @@ -251,7 +251,7 @@ deps = { '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@c109945e729cb3d8c17f306c9cae9d3f98d7d323', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@0ab52232ff00523c4ccf6270a9e6ed2c9f1fa5e1', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@686d6944501a6ee9c849581e3fe343273d4af3f6', 'src/third_party/flatbuffers/src': @@ -316,7 +316,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlin_stdlib', - 'version': '5lJOPRAms_Yty4OyjHlXdB_6UFqzeGHM6YuuuUZ3P9MC', + 'version': 'zgrGgJIQ7F4H3GT_uf41Ya6Pw7BBQlC99_kJVEwfEk8C', }, ], 'condition': 'checkout_android', @@ -351,13 +351,13 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@5361e5909e80f71900ba231872fe0cc008d1e3cb', + 'https://android.googlesource.com/platform/external/perfetto.git@48c5df53f475348c2ed8e5ee6f19319718642cf0', 'src/third_party/protobuf-javascript/src': Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295', 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@09b3d5fc5aa48752f95f4c0c37b0bd4ff55c0ba1', + 'https://chromium.googlesource.com/webm/libvpx.git@906334ac1de2b0afa666472dce5545b82c1251fb', 'src/third_party/libyuv': - 'https://chromium.googlesource.com/libyuv/libyuv.git@77f3acade492a41a11a07a55b58a6f8180b898eb', + 'https://chromium.googlesource.com/libyuv/libyuv.git@a8e59d207483f75b87dd5fc670e937672cdf5776', 'src/third_party/lss': { 'url': 'https://chromium.googlesource.com/linux-syscall-support.git@ce877209e11aa69dcfffbd53ef90ea1d07136521', 'condition': 'checkout_android or checkout_linux', @@ -399,7 +399,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'yEomA-IPmb_JtuiEvwgtxRHtSEaICkDY1sDko_rQGO0C', + 'version': '3KCj5eRYCvGGYs5i90pRaeihkzsqgUGc4OkICT8AOlIC', }, ], 'condition': 'checkout_android', @@ -410,7 +410,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@8c5814c8d24ad90987b4cbd3c69947fc2e461f0e', + 'https://chromium.googlesource.com/chromium/src/tools@3a202879c10d5517ac112f719ad6d07f93e59b9c', 'src/third_party/espresso': { 'packages': [ @@ -449,7 +449,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'yhwW_7P0l18P6ykZSqwXqx6HFyhPIcUGNcebIIppU-IC', + 'version': 'k1wif7sS51pJGSFGN7FAeGWDorxgPart9E1f383TQL4C', }, ], 'condition': 'checkout_android and non_git_source', @@ -460,7 +460,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': 'p2c9mSgfF-HErc8CM-jOFuuMbaMK-POsiqbeG5plk2cC', + 'version': 'qI7pOwGO6rjfncAZKTugRAPn9Qs_MdwCWpzfRuiBgGMC', }, ], 'condition': 'checkout_android', @@ -542,11 +542,11 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:78b3b3ca47e64b3280a5dd5b83c23ce89f04d328', + 'version': 'git_revision:ff7417442432e6669b74c02c63d61834f865aa77', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:78b3b3ca47e64b3280a5dd5b83c23ce89f04d328', + 'version': 'git_revision:ff7417442432e6669b74c02c63d61834f865aa77', }, ], 'dep_type': 'cipd', diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 398b0c3b5e..fd838119ff 100644 --- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -1269,7 +1269,7 @@ public class PeerConnectionClient { @Override public void onSelectedCandidatePairChanged(CandidatePairChangeEvent event) { - Log.d(TAG, "Selected candidate pair changed because: " + event); + Log.d(TAG, "Selected candidate pair changed because: " + event.reason); } @Override diff --git a/sdk/android/api/org/webrtc/CryptoOptions.java b/sdk/android/api/org/webrtc/CryptoOptions.java index 6e06bc6426..23f1e70f5a 100644 --- a/sdk/android/api/org/webrtc/CryptoOptions.java +++ b/sdk/android/api/org/webrtc/CryptoOptions.java @@ -21,6 +21,7 @@ public final class CryptoOptions { /** * SRTP Related Peer Connection Options. */ + @SuppressWarnings("ClassCanBeStatic") public final class Srtp { /** * Enable GCM crypto suites from RFC 7714 for SRTP. GCM will only be used @@ -66,6 +67,7 @@ public final class CryptoOptions { /** * Options to be used when the FrameEncryptor / FrameDecryptor APIs are used. */ + @SuppressWarnings("ClassCanBeStatic") public final class SFrame { /** * If set all RtpSenders must have an FrameEncryptor attached to them before diff --git a/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java b/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java index b118843ea0..8e38c1f34f 100644 --- a/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java +++ b/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java @@ -432,7 +432,7 @@ public class JavaAudioDeviceModule implements AudioDeviceModule { */ @RequiresApi(Build.VERSION_CODES.M) public void setPreferredInputDevice(AudioDeviceInfo preferredInputDevice) { - Logging.d(TAG, "setPreferredInputDevice: " + preferredInputDevice); + Logging.d(TAG, "setPreferredInputDevice: " + preferredInputDevice.getId()); audioInput.setPreferredDevice(preferredInputDevice); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java index 00bbff08eb..5851146c84 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java @@ -42,6 +42,7 @@ public class Camera2CapturerTest { @Nullable CameraDevice cameraDevice; // Guarded by cameraDeviceLock boolean openSucceeded; // Guarded by cameraDeviceLock + @SuppressWarnings("ClassCanBeStatic") private class LooperThread extends Thread { final CountDownLatch startedSignal = new CountDownLatch(1); private Handler handler;