From 56c2406f8cf850bf98b54ab5aa04d7616d97688a Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 30 Jul 2021 10:21:30 +0200 Subject: [PATCH] Roll chromium_revision 03a29cf406..0549de0c2d (904346:907032) This CL also includes the changes required to fix build errors on Android builds. Change log: https://chromium.googlesource.com/chromium/src/+log/03a29cf406..0549de0c2d Full diff: https://chromium.googlesource.com/chromium/src/+/03a29cf406..0549de0c2d Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/58887e6f2a..fe7fd7b2be * src/build: https://chromium.googlesource.com/chromium/src/build/+log/4638e26758..8aa210e09b * src/buildtools/linux64: git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b..git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e * src/buildtools/mac: git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b..git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/e8bf577fbf..24e92c2bee * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/d7b11d7989..cdb04dc77c * src/buildtools/win: git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b..git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/c172f6d55d..dafd1d1517 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/e6a8848e04..45ed21d9c9 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/43300033c5..be994fedb5 * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib: version:2@1.5.10.cr0..version:2@1.5.21.cr0 * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common: version:2@1.5.10.cr0..version:2@1.5.21.cr0 * src/third_party/android_sdk/public: 8LZujEmLjSh0g3JciDA3cslSptxKs9HOa_iUPXkOeYQC..tRoD45SCi7UleQqSV7MrMQO1_e5P8ysphkCcj6z_cCQC * src/third_party/android_sdk/public: V__2Ycej-H2-6AcXX5A3gi7sIk74SuN44PBm2uC_N1sC..ZT3JmI6GMG4YVcZ1OtECRVMOLLJAWAdPbi-OclubJLMC * src/third_party/android_sdk/public: A4EvXZUIuQho0QRDJopMUpgyp6NA3aiDQjGKPUKbowMC..gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC * src/third_party/android_sdk/public: 8tF0AOj7Dwlv4j7_nfkhxWB0jzrvWWYjEIpirt8FIWYC..qi_k82nm6j9nz4dQosOoqXew4_TFAy8rcGOHDLptx1sC * src/third_party/android_sdk/public: YMUu9EHNZ__2Xcxl-KsaSf-dI5TMt_P62IseUVsxktMC..lL3IGexKjYlwjO_1Ga-xwxgwbE_w-lmi2Zi1uOlWUIAC * src/third_party/android_sdk/public: 4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C..n7svc8KYah-i4s8zwkVa85SI3_H0WFOniP0mpwNdFO0C * src/third_party/androidx: hKpaz7h0NioWOEg8YP2hSuRaZ6uRCUEUcmNcvkxr9aYC..HHo3GgWHTJyTdX1eY15wQ40-pIfmMojudjRzMFoE8JoC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/a10017c548..519c2986c7 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/9ac1fdf373..10f6e4b89b * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/801cd842e2..47b1a541cb * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/4ec4cd23f4..2d924d7a97 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/aba245dde3..d80b8cecab * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/eebc5cd487..977e77006e * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/13482fe8f9..9edd589321 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/2f3bb89f4e..f7be2d25c7 * src/tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:63874080a20260642c8df82d4f4885ff30b33fb6 * src/tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:63874080a20260642c8df82d4f4885ff30b33fb6 * src/tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:63874080a20260642c8df82d4f4885ff30b33fb6 DEPS diff: https://chromium.googlesource.com/chromium/src/+/03a29cf406..0549de0c2d/DEPS Clang version changed llvmorg-13-init-15163-g98033fdc:llvmorg-13-init-15561-gf98ed74f Details: https://chromium.googlesource.com/chromium/src/+/03a29cf406..0549de0c2d/tools/clang/scripts/update.py TBR=xalep@webrtc.org,marpan@webrtc.org, jianj@chromium.org, BUG=None No-Try: True Change-Id: Iceca2600ab3aeff37d325ec68565c06f9db5b0fd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227280 Reviewed-by: Andrey Logvin Reviewed-by: Artem Titov Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34599} --- DEPS | 72 +++++++++---------- examples/BUILD.gn | 1 + .../apprtc/test/PeerConnectionClientTest.java | 2 +- sdk/android/BUILD.gn | 2 + ...ndroidVideoDecoderInstrumentationTest.java | 2 +- .../BuiltinAudioCodecsFactoryFactoryTest.java | 3 +- .../Camera1CapturerUsingByteBufferTest.java | 6 +- .../Camera1CapturerUsingTextureTest.java | 6 +- .../src/org/webrtc/Camera2CapturerTest.java | 6 +- .../DefaultVideoEncoderFactoryTest.java | 2 +- .../src/org/webrtc/EglRendererTest.java | 2 +- .../src/org/webrtc/FileVideoCapturerTest.java | 2 +- .../src/org/webrtc/GlRectDrawerTest.java | 4 +- .../org/webrtc/HardwareVideoEncoderTest.java | 2 +- .../src/org/webrtc/LoggableTest.java | 8 +-- .../src/org/webrtc/NetworkMonitorTest.java | 4 +- .../webrtc/PeerConnectionEndToEndTest.java | 4 +- .../org/webrtc/PeerConnectionFactoryTest.java | 2 +- .../src/org/webrtc/PeerConnectionTest.java | 2 +- .../src/org/webrtc/RendererCommonTest.java | 2 +- .../src/org/webrtc/RtcCertificatePemTest.java | 2 +- .../src/org/webrtc/RtpSenderTest.java | 2 +- .../src/org/webrtc/RtpTransceiverTest.java | 2 +- .../org/webrtc/SurfaceTextureHelperTest.java | 4 +- .../SurfaceViewRendererOnMeasureTest.java | 2 +- .../src/org/webrtc/TimestampAlignerTest.java | 2 +- .../src/org/webrtc/VideoFileRendererTest.java | 2 +- .../src/org/webrtc/VideoFrameBufferTest.java | 2 +- .../src/org/webrtc/VideoTrackTest.java | 2 +- .../src/org/webrtc/WebRtcJniBootTest.java | 2 +- .../src/org/webrtc/YuvHelperTest.java | 2 +- 31 files changed, 80 insertions(+), 78 deletions(-) diff --git a/DEPS b/DEPS index fe1142360b..329d29a458 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': '03a29cf406887d9341dc238c873402084352613e', + 'chromium_revision': '0549de0c2dd89c4f2e1a8adc826aa1276ceff25f', # Keep the Chromium default of generating location tags. 'generate_location_tags': True, @@ -20,9 +20,9 @@ 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@58887e6f2a7d5c37befea9ffb4d675df86bae5b7', + 'https://chromium.googlesource.com/chromium/src/base@fe7fd7b2be73196d6381a6a841617b844da0c6ba', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@4638e2675872e022efd9315b34bd364d5c62cac4', + 'https://chromium.googlesource.com/chromium/src/build@8aa210e09b1f2638c84756347dd0bea7160246dd', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@37dc929ecb351687006a61744b116cda601753d7', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. @@ -31,19 +31,19 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@c172f6d55d8006686cc2e9a11bd775de46da15bd', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@dafd1d1517acf010fa979e6bca21cd80e0fbe13c', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@e6a8848e04224cdd729ba957e7133368e2b4fa3f', + 'https://chromium.googlesource.com/chromium/src/testing@45ed21d9c9f5819a8db6c95fd2292cc4256b5541', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@43300033c567983076ecf876ae86bd31dc9739a6', + 'https://chromium.googlesource.com/chromium/src/third_party@be994fedb5a5e2ed41e8c3f3e59b85f85d33d311', 'src/buildtools/linux64': { 'packages': [ { 'package': 'gn/gn/linux-amd64', - 'version': 'git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b', + 'version': 'git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e', } ], 'dep_type': 'cipd', @@ -53,7 +53,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-${{arch}}', - 'version': 'git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b', + 'version': 'git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e', } ], 'dep_type': 'cipd', @@ -63,7 +63,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b', + 'version': 'git_revision:c0a2d23c21e87f27f5af3e5dc2a99f2ef3480b9e', } ], 'dep_type': 'cipd', @@ -75,9 +75,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@e8bf577fbfe1b1ce53fcade2a5f3f0fe02fa1a2e', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@24e92c2beed59b76ddabe7ceb5ee4b40f09e0712', 'src/buildtools/third_party/libunwind/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d7b11d7989774617bd7df93af95734faac8c0b2c', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@cdb04dc77cd222c79c00a55bd11d4dc0e91b6cf1', 'src/tools/clang/dsymutil': { 'packages': [ @@ -93,8 +93,8 @@ deps = { 'src/third_party/android_system_sdk': { 'packages': [ { - 'package': 'chromium/third_party/android_system_sdk', - 'version': 'no8ss5nRg6uYDM08HboypuIQuix7bS1kVqRGyWmwP-YC', + 'package': 'chromium/third_party/android_system_sdk/public', + 'version': 'oSfDIvHlCa6W0gS79Q5OOfB9E4eBg3uAvi3BEDN21U0C', }, ], 'condition': 'checkout_android', @@ -124,11 +124,11 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@a10017c548b0805eb98e7847c37370dbd37cd8d6', + 'https://boringssl.googlesource.com/boringssl.git@519c2986c73c23461b130ad19b93fd7d081353d5', 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@32096a2dc8f8a7d5aac4097e34912bb7e06a5277', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@9ac1fdf373609aac2e866e298067d78e053b6527', + 'https://chromium.googlesource.com/catapult.git@10f6e4b89b5ea65a4034f675a9db5bfb50686eaf', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -150,7 +150,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@801cd842e27c85cb1d5000f6397f382ffe295daa', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@47b1a541cb1943d85da3976b93f9a5ed490288e2', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@cc9bb294919e846ef8a0731b5e9f304f95ef3bb8', 'src/third_party/google_benchmark/src': { @@ -170,7 +170,7 @@ deps = { 'dep_type': 'cipd', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@4ec4cd23f486bf70efcc5d2caa40f24368f752e3', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@2d924d7a971e9667d76ad09727fb2402b4f8a1e3', 'src/third_party/icu': { 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@2a822c5626ab1ed40366758e4740b4f0ea40237d', }, @@ -208,15 +208,15 @@ deps = { 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@5b7c744eb8310250ccc534f3f86a2015b3887a0a', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@aba245dde334bd51a20940eb009fa46b6ffd4511', + 'https://aomedia.googlesource.com/aom.git@d80b8cecab493f07d947dfd27c06cfde2f5b9f69', 'src/third_party/libunwindstack': { 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@b34a0059a648f179ef05da2c0927f564bdaea2b3', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@13482fe8f91c9249d7311899e1627f0ea670afb7', + 'https://android.googlesource.com/platform/external/perfetto.git@9edd589321cb98c899339f07f9ec386a6a37a2d0', 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@eebc5cd487a89c51ba148f6d6ac45779970f72d7', + 'https://chromium.googlesource.com/webm/libvpx.git@977e77006ee175f23beb231d0de2968f5c9d17b0', 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@49ebc996aa8c4bdf89c1b5ea461eb677234c61cc', 'src/third_party/lss': { @@ -271,7 +271,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@2f3bb89f4e4a952f55afbd3b7f36e02d404141b5', + 'https://chromium.googlesource.com/chromium/src/tools@f7be2d25c78f2386215ea6a5d1a789190b962843', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c', @@ -372,7 +372,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'hKpaz7h0NioWOEg8YP2hSuRaZ6uRCUEUcmNcvkxr9aYC', + 'version': 'HHo3GgWHTJyTdX1eY15wQ40-pIfmMojudjRzMFoE8JoC', }, ], 'condition': 'checkout_android', @@ -382,12 +382,12 @@ deps = { 'src/third_party/android_sdk/public': { 'packages': [ { - 'package': 'chromium/third_party/android_sdk/public/build-tools/30.0.1', - 'version': '8LZujEmLjSh0g3JciDA3cslSptxKs9HOa_iUPXkOeYQC', + 'package': 'chromium/third_party/android_sdk/public/build-tools/31.0.0', + 'version': 'tRoD45SCi7UleQqSV7MrMQO1_e5P8ysphkCcj6z_cCQC', }, { 'package': 'chromium/third_party/android_sdk/public/emulator', - 'version': 'A4EvXZUIuQho0QRDJopMUpgyp6NA3aiDQjGKPUKbowMC', + 'version': 'gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC', }, { 'package': 'chromium/third_party/android_sdk/public/extras', @@ -399,19 +399,19 @@ deps = { }, { 'package': 'chromium/third_party/android_sdk/public/platform-tools', - 'version': '8tF0AOj7Dwlv4j7_nfkhxWB0jzrvWWYjEIpirt8FIWYC', + 'version': 'qi_k82nm6j9nz4dQosOoqXew4_TFAy8rcGOHDLptx1sC', }, { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-30', - 'version': 'YMUu9EHNZ__2Xcxl-KsaSf-dI5TMt_P62IseUVsxktMC', + 'package': 'chromium/third_party/android_sdk/public/platforms/android-31', + 'version': 'lL3IGexKjYlwjO_1Ga-xwxgwbE_w-lmi2Zi1uOlWUIAC', }, { - 'package': 'chromium/third_party/android_sdk/public/sources/android-29', - 'version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C', + 'package': 'chromium/third_party/android_sdk/public/sources/android-30', + 'version': 'n7svc8KYah-i4s8zwkVa85SI3_H0WFOniP0mpwNdFO0C', }, { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'V__2Ycej-H2-6AcXX5A3gi7sIk74SuN44PBm2uC_N1sC', + 'version': 'ZT3JmI6GMG4YVcZ1OtECRVMOLLJAWAdPbi-OclubJLMC', }, ], 'condition': 'checkout_android', @@ -477,15 +477,15 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d', + 'version': 'git_revision:63874080a20260642c8df82d4f4885ff30b33fb6', }, { 'package': 'infra/tools/luci/isolated/${{platform}}', - 'version': 'git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d', + 'version': 'git_revision:63874080a20260642c8df82d4f4885ff30b33fb6', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d', + 'version': 'git_revision:63874080a20260642c8df82d4f4885ff30b33fb6', }, ], 'dep_type': 'cipd', @@ -2107,7 +2107,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib', - 'version': 'version:2@1.5.10.cr0', + 'version': 'version:2@1.5.21.cr0', }, ], 'condition': 'checkout_android', @@ -2118,7 +2118,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common', - 'version': 'version:2@1.5.10.cr0', + 'version': 'version:2@1.5.21.cr0', }, ], 'condition': 'checkout_android', diff --git a/examples/BUILD.gn b/examples/BUILD.gn index b109d903e5..dbe383f565 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -216,6 +216,7 @@ if (is_android) { "../sdk/android:video_api_java", "../sdk/android:video_java", "//third_party/android_support_test_runner:runner_java", + "//third_party/androidx:androidx_test_runner_java", "//third_party/junit", ] } diff --git a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java index 99e0ff6531..63cea5911b 100644 --- a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java +++ b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java @@ -15,9 +15,9 @@ import static org.junit.Assert.fail; import android.os.Build; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.filters.SmallTest; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index d4e8d182fe..d0c3a41e7a 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1456,6 +1456,7 @@ if (is_android) { "//third_party/android_deps:guava_android_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", + "//third_party/androidx:androidx_test_runner_java", "//third_party/google-truth:google_truth_java", "//third_party/hamcrest:hamcrest_java", "//third_party/hamcrest:hamcrest_library_java", @@ -1587,6 +1588,7 @@ if (is_android) { ":video_java", "../../rtc_base:base_java", "//third_party/android_support_test_runner:runner_java", + "//third_party/androidx:androidx_test_runner_java", ] } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java b/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java index 84196bcbd7..5b71370fe6 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.support.annotation.Nullable; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java b/sdk/android/instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java index 36ee0e932e..976f7185ea 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java @@ -12,8 +12,7 @@ package org.webrtc; import static com.google.common.truth.Truth.assertThat; -import android.support.test.filters.SmallTest; - +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java index 4c8361e334..981eeeffaf 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java @@ -12,9 +12,9 @@ package org.webrtc; import android.content.Context; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.After; import org.junit.Before; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java index 4f71915c38..2c06935c13 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java @@ -12,9 +12,9 @@ package org.webrtc; import android.content.Context; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.After; import org.junit.Before; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java index e351bdf5df..c358dc05e4 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java @@ -21,9 +21,9 @@ import android.os.Handler; import android.os.Looper; import android.support.annotation.Nullable; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.LargeTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.util.concurrent.CountDownLatch; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.After; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java index 8135e80eaf..2a1af66b19 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java @@ -13,7 +13,7 @@ package org.webrtc; import static org.junit.Assert.assertEquals; import android.support.annotation.Nullable; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.util.ArrayList; import java.util.HashMap; import org.chromium.base.test.BaseJUnit4ClassRunner; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java index a79ded3a0a..2bd91905b7 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java @@ -22,7 +22,7 @@ import android.graphics.SurfaceTexture; import android.opengl.GLES11Ext; import android.opengl.GLES20; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java index 6f7ac9f512..c58d87b55c 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.os.Environment; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java index 30aa2ba2cc..0760d64902 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.opengl.GLES20; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import java.util.Random; import org.chromium.base.test.BaseJUnit4ClassRunner; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java index 4eb033b210..a9f10c5c31 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java @@ -19,8 +19,8 @@ import android.annotation.TargetApi; import android.graphics.Matrix; import android.opengl.GLES11Ext; import android.support.annotation.Nullable; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/LoggableTest.java b/sdk/android/instrumentationtests/src/org/webrtc/LoggableTest.java index 3831345cb2..ff5cfee6dd 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/LoggableTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/LoggableTest.java @@ -10,18 +10,18 @@ package org.webrtc; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; import java.util.ArrayList; import org.junit.Test; import org.junit.runner.RunWith; -import org.webrtc.PeerConnectionFactory; -import org.webrtc.Logging.Severity; import org.webrtc.Loggable; +import org.webrtc.Logging.Severity; +import org.webrtc.PeerConnectionFactory; @RunWith(AndroidJUnit4.class) public class LoggableTest { diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java index 5f7e07df55..b1b466cd6f 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java @@ -27,9 +27,9 @@ import android.os.Looper; import android.support.annotation.Nullable; import android.support.test.InstrumentationRegistry; import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; import android.support.test.rule.UiThreadTestRule; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.util.List; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Before; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java index c380310b83..72b7e44a4f 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertTrue; import android.support.annotation.Nullable; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.lang.ref.WeakReference; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java index 907067ae21..92d44698a8 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java @@ -11,8 +11,8 @@ package org.webrtc; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java index bde4960edd..8478fe5571 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.util.Arrays; import java.util.List; import org.chromium.base.test.BaseJUnit4ClassRunner; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java index daa1dd4a61..01eb4c846d 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java @@ -19,7 +19,7 @@ import static org.webrtc.RendererCommon.getDisplaySize; import static org.webrtc.RendererCommon.getLayoutMatrix; import android.graphics.Point; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java index 00f295c942..70bceffd40 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java @@ -12,7 +12,7 @@ package org.webrtc; import static com.google.common.truth.Truth.assertThat; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/RtpSenderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RtpSenderTest.java index af9c62bda9..70bc43e36d 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/RtpSenderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/RtpSenderTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.util.Arrays; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Before; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/RtpTransceiverTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RtpTransceiverTest.java index fd13d11b22..e97bd3d32b 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/RtpTransceiverTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/RtpTransceiverTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java index 1d5ae935fd..99ccc1e3c0 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java @@ -17,8 +17,8 @@ import static org.junit.Assert.fail; import android.opengl.GLES20; import android.os.SystemClock; import android.support.annotation.Nullable; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import java.util.concurrent.CountDownLatch; import org.chromium.base.test.BaseJUnit4ClassRunner; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java index 57ddd7ef3a..a4938d7939 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java @@ -17,9 +17,9 @@ import android.annotation.SuppressLint; import android.graphics.Point; import android.support.test.InstrumentationRegistry; import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; import android.support.test.rule.UiThreadTestRule; import android.view.View.MeasureSpec; +import androidx.test.filters.MediumTest; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/TimestampAlignerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/TimestampAlignerTest.java index 1d944b57f9..930a450af0 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/TimestampAlignerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/TimestampAlignerTest.java @@ -10,7 +10,7 @@ package org.webrtc; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.params.BaseJUnit4RunnerDelegate; import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate; import org.junit.BeforeClass; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java index 90f447332e..70950b9eb4 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java @@ -13,7 +13,7 @@ package org.webrtc; import static org.junit.Assert.assertEquals; import android.os.Environment; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java b/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java index 096edc9c9c..1744bd0c9b 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java @@ -19,7 +19,7 @@ import android.graphics.Matrix; import android.opengl.GLES20; import android.os.Handler; import android.os.HandlerThread; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/VideoTrackTest.java b/sdk/android/instrumentationtests/src/org/webrtc/VideoTrackTest.java index 820fbf600b..938f488efd 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/VideoTrackTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/VideoTrackTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java index e6c4328dd9..5819900d94 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java @@ -11,8 +11,8 @@ package org.webrtc; import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; import org.webrtc.PeerConnectionFactory; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/YuvHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/YuvHelperTest.java index c8a88f0e6e..693bdd4a79 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/YuvHelperTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/YuvHelperTest.java @@ -13,7 +13,7 @@ package org.webrtc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.nio.ByteBuffer; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Before;