From cd1ba9411ba28ebb31fb1883a8a5c70750d3cd89 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 12 May 2020 12:12:13 +0200 Subject: [PATCH] Roll chromium_revision a775f4aeaa..ceb47b836c (759199:767701) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change log: https://chromium.googlesource.com/chromium/src/+log/a775f4aeaa..ceb47b836c Full diff: https://chromium.googlesource.com/chromium/src/+/a775f4aeaa..ceb47b836c Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/2e2abc3c38..96e022e94f * src/build: https://chromium.googlesource.com/chromium/src/build/+log/212b25dc86..694ba37aa6 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/2c41dfb19a..204a35a2a6 * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/43bb9f8722..d999d54f4b * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f8d00d1cb..022f563d9d * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/e5ced51413..5c92cb7930 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/76bcf1e499..1d3eddb497 * src/third_party/android_build_tools/aapt2: LKH_DI44rZhQ4RkScMFQLGSJ4jZyuPcff0llITnq-i4C..R2k5wwOlIaS6sjv2TIyHotiPJod-6KqnZO8NH-KFK8sC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/f9e0cda2d8..5f43b12d52 * src/third_party/breakpad/breakpad: https://chromium.googlesource.com/breakpad/breakpad.git/+log/f32b83eb08..2ffe116322 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4b4e879132..ed728376c1 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/e1a9c8db7e..1fbaf73aef * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/31886e8f39..587a3f4849 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/11beee855e..093f87bfe4 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/e3f0319d89..a09ea700d3 * src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/0d5695983e..100d40c827 * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/13cfcd5874..f222396170 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/611c58e511..c810066815 * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/8dc6f353c6..77960f37b3 * src/third_party/openh264/src: https://chromium.googlesource.com/external/github.com/cisco/openh264/+log/6f26bce0b1..a5473711f3 * src/third_party/r8: I91wspV6GMc7l_m-k9v3-ooP-CBrK76OVc3rfnB5T7kC..UAycWqc5QfELtJhhnoU4jQHjsyxPjRNyZ0EfvlojaY4C * src/third_party/usrsctp/usrsctplib: https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/bee946a606..a8c51df76c * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/3f15275073..fe020f1696 * src/tools/luci-go: git_revision:513b1319d7d855f6c42bc01471562df910fd61b3..git_revision:56ae79476e3caf14da59d75118408aa778637936 * src/tools/luci-go: git_revision:513b1319d7d855f6c42bc01471562df910fd61b3..git_revision:56ae79476e3caf14da59d75118408aa778637936 * src/tools/luci-go: git_revision:513b1319d7d855f6c42bc01471562df910fd61b3..git_revision:56ae79476e3caf14da59d75118408aa778637936 Added dependencies * src/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry * src/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks * src/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager * src/third_party/android_deps/libs/nekohtml_xercesMinimal * src/third_party/android_deps/libs/org_robolectric_resources * src/third_party/android_deps/libs/org_apache_maven_maven_artifact * src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent * src/third_party/android_deps/libs/org_robolectric_sandbox * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared * src/third_party/android_deps/libs/org_robolectric_pluginapi * src/third_party/android_deps/libs/org_robolectric_utils_reflector * src/third_party/android_deps/libs/nekohtml_nekohtml * src/third_party/android_deps/libs/org_apache_ant_ant * src/third_party/android_deps/libs/org_apache_ant_ant_launcher * src/third_party/android_deps/libs/org_robolectric_shadowapi * src/third_party/android_deps/libs/org_robolectric_junit * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs * src/third_party/android_deps/libs/classworlds_classworlds * src/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics * src/third_party/android_deps/libs/org_robolectric_annotations * src/third_party/android_deps/libs/org_apache_maven_maven_model * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default * src/third_party/android_deps/libs/org_apache_maven_maven_profile * src/third_party/android_deps/libs/org_apache_maven_maven_settings * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api * src/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata * src/third_party/android_deps/libs/org_robolectric_robolectric * src/third_party/android_deps/libs/org_robolectric_shadows_framework * src/third_party/android_deps/libs/org_apache_maven_maven_project * src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation * src/third_party/android_deps/libs/org_robolectric_utils * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight * src/third_party/android_deps/libs/androidx_tvprovider_tvprovider DEPS diff: https://chromium.googlesource.com/chromium/src/+/a775f4aeaa..ceb47b836c/DEPS No update to Clang. TBR=mbonadei@webrtc.org,marpan@webrtc.org, jianj@chromium.org, BUG=None Roll Change-Id: Ic5663e5313eb2a2a37cd0e5cca2c896e22512740 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174829 Reviewed-by: Mirko Bonadei Reviewed-by: Sami Kalliomäki Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#31223} --- DEPS | 464 +++++++++++++++++++++++++++++++++++++++---- sdk/android/BUILD.gn | 1 + 2 files changed, 428 insertions(+), 37 deletions(-) diff --git a/DEPS b/DEPS index 2cda0d3ed6..25f4f8daba 100644 --- a/DEPS +++ b/DEPS @@ -8,31 +8,31 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'a775f4aeaa5e5847ca65467a39d5b4a2d1d54d6f', + 'chromium_revision': 'ceb47b836cba8e870c4ea50b2cffcff333f52580', } 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@2e2abc3c3844639a5f8d8ec3762875f01f9c1384', + 'https://chromium.googlesource.com/chromium/src/base@96e022e94fc5387e2da12436e460d94b2ff33277', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@212b25dc86151e32abc71fa5d129614937666d69', + 'https://chromium.googlesource.com/chromium/src/build@694ba37aa6a6b597a9e64e602c41f13a683f86a1', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@2c41dfb19abe40908834803b6fed797b0f341fe1', + 'https://chromium.googlesource.com/chromium/src/buildtools@204a35a2a64f7179f8b76d7a0385653690839e21', # Gradle 4.3-rc4. 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@89af43c4d0506f69980f00dde78c97b2f81437f8', 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@2f8d00d1cb5b73ec4329dff7ec1ababf6a05e628', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@022f563d9d05db04c1374553f52e069e98364d3b', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@e5ced5141379ee8ae28b4f93d3c02df039d2b052', + 'https://chromium.googlesource.com/chromium/src/testing@5c92cb79302f296134d34d19fae32339e992713c', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@76bcf1e4994827b25b4539a9ef5eed382d2de992', + 'https://chromium.googlesource.com/chromium/src/third_party@1d3eddb4978275852352b34da101a2abcc1aeafc', 'src/buildtools/linux64': { 'packages': [ @@ -72,7 +72,7 @@ deps = { 'src/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@196ba1aaa8ac285d94f4ea8d9836390a45360533', 'src/buildtools/third_party/libunwind/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@43bb9f872232f531bac80093ceb4de61c64b9ab7', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d999d54f4bca789543a2eb6c995af2d9b5a1f3ed', 'src/tools/clang/dsymutil': { 'packages': [ @@ -100,7 +100,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': 'LKH_DI44rZhQ4RkScMFQLGSJ4jZyuPcff0llITnq-i4C', + 'version': 'R2k5wwOlIaS6sjv2TIyHotiPJod-6KqnZO8NH-KFK8sC', }, ], 'condition': 'checkout_android', @@ -119,20 +119,20 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@f9e0cda2d81858d10ceeadb0d21f4026f8602cf7', + 'https://boringssl.googlesource.com/boringssl.git@5f43b12d52e94b50e481bae2ccb74ab95904123d', 'src/third_party/breakpad/breakpad': - 'https://chromium.googlesource.com/breakpad/breakpad.git@f32b83eb08e9ee158d3037b2114357187fd45a05', + 'https://chromium.googlesource.com/breakpad/breakpad.git@2ffe116322aa4373d408a72b665fa7fe7a504d4a', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@4b4e8791324284c92a5e6a84d93ed9ccdbbd375e', + 'https://chromium.googlesource.com/catapult.git@ed728376c1a8e8b8a689cd22d7fe953a634c9d5e', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@e1a9c8db7e7cf6ba7d70b06ec3f3cf6d74451680', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@1fbaf73aef262941d88558e4214b39d43da9d849', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@31886e8f39a47a9d7107d4c937bb053dcf5699ce', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@587a3f48499df05d3c65f1529fd08b0783217b39', 'src/third_party/findbugs': { 'url': 'https://chromium.googlesource.com/chromium/deps/findbugs.git@4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', @@ -143,9 +143,9 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@11beee855e29757a07320fd60e85de2e8da4e037', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@093f87bfe45160195ade7bd5174bbaaf50ebd6be', 'src/third_party/harfbuzz-ng/src': - 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@0d5695983e8bf3184ecd4cb92f737b9dfe5d6d25', + 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@100d40c827eb8336b2b671856f151275d47e71ad', # WebRTC-only dependency (not present in Chromium). 'src/third_party/gtest-parallel': 'https://chromium.googlesource.com/external/github.com/google/gtest-parallel@df0b4e476f98516cea7d593e5dbb0fca44f6ee7f', @@ -160,13 +160,9 @@ deps = { 'dep_type': 'cipd', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@e3f0319d89f4cbf32993de595d984183b1a9fc57', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@a09ea700d32bab83325aff9ff34d0582e50e3997', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@13cfcd5874f6c39c34ec57fa5295e7910ae90b8d', - }, - 'src/third_party/jsr-305/src': { - 'url': 'https://chromium.googlesource.com/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919', - 'condition': 'checkout_android', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@f2223961702f00a8833874b0560d615a2cc42738', }, 'src/third_party/jdk': { 'packages': [ @@ -196,9 +192,13 @@ deps = { 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@650611720ecc23e0e6b32b0e3100f8b4df91696c', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@611c58e511042782869dfcb6e0450587b30fc5f2', + 'https://aomedia.googlesource.com/aom.git@c810066815b80dd1ac8ade15170ce962d6646368', + 'src/third_party/libunwindstack': { + 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@acf93761dc00ac67bd7534c4040699abed4f8d94', + 'condition': 'checkout_android', + }, 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@8dc6f353c6d04329cf59529f41a6f46d9dbfcafa', + 'https://chromium.googlesource.com/webm/libvpx.git@77960f37b3d328cf7552f6cd69a083f4005aed7b', 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@6afd9becdf58822b1da6770598d8597c583ccfad', 'src/third_party/lss': { @@ -216,12 +216,12 @@ deps = { }, 'src/third_party/openh264/src': - 'https://chromium.googlesource.com/external/github.com/cisco/openh264@6f26bce0b1c4e8ce0e13332f7c0083788def5fdf', + 'https://chromium.googlesource.com/external/github.com/cisco/openh264@a5473711f3e20c6bd1c33d81b6c7b9a0618aa18f', 'src/third_party/r8': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'I91wspV6GMc7l_m-k9v3-ooP-CBrK76OVc3rfnB5T7kC', + 'version': 'UAycWqc5QfELtJhhnoU4jQHjsyxPjRNyZ0EfvlojaY4C', }, ], 'condition': 'checkout_android', @@ -250,16 +250,14 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/usrsctp/usrsctplib': - 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@bee946a606752a443bd70bca1cb296527fed706d', + 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@a8c51df76caae94254b1e59999405f739467490e', # Dependency used by libjpeg-turbo. 'src/third_party/yasm/binaries': { 'url': 'https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881', 'condition': 'checkout_win', }, - 'src/third_party/yasm/source/patched-yasm': - 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@3f15275073fc339e14f39df61fbace5bad82e93d', + 'https://chromium.googlesource.com/chromium/src/tools@fe020f1696a526e27ad792a6b23f00066fbe96db', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@160b445a44e0daacf6f3f8570ca2707ec451f374', @@ -397,10 +395,6 @@ deps = { 'package': 'chromium/third_party/android_sdk/public/sources/android-29', 'version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C', }, - { - 'package': 'chromium/third_party/android_sdk/public/tools-lint', - 'version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC', - }, { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', 'version': 'CR25ixsRhwuRnhdgDpGFyl9S0C_0HO9SUgFrwX46zq8C', @@ -496,15 +490,15 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:513b1319d7d855f6c42bc01471562df910fd61b3', + 'version': 'git_revision:56ae79476e3caf14da59d75118408aa778637936', }, { 'package': 'infra/tools/luci/isolated/${{platform}}', - 'version': 'git_revision:513b1319d7d855f6c42bc01471562df910fd61b3', + 'version': 'git_revision:56ae79476e3caf14da59d75118408aa778637936', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:513b1319d7d855f6c42bc01471562df910fd61b3', + 'version': 'git_revision:56ae79476e3caf14da59d75118408aa778637936', }, ], 'dep_type': 'cipd', @@ -1151,6 +1145,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_tvprovider_tvprovider': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_tvprovider_tvprovider', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable': { 'packages': [ { @@ -1195,6 +1200,28 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent', + 'version': 'version:3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/classworlds_classworlds': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/classworlds_classworlds', + 'version': 'version:1.1-alpha-2-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { 'packages': [ { @@ -1635,6 +1662,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs', + 'version': 'version:1.0.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': { 'packages': [ { @@ -2229,6 +2267,28 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/nekohtml_nekohtml': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml', + 'version': 'version:1.9.6.2-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/nekohtml_xercesMinimal': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/nekohtml_xercesminimal', + 'version': 'version:1.9.6.2-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap': { 'packages': [ { @@ -2251,6 +2311,182 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_apache_ant_ant': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant', + 'version': 'version:1.8.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_ant_ant_launcher': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant_launcher', + 'version': 'version:1.8.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks', + 'version': 'version:2.1.3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_artifact': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_model': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_model', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_profile': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_profile', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_project': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_project', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_maven_settings': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_settings', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file', + 'version': 'version:1.0-beta-6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight', + 'version': 'version:1.0-beta-6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared', + 'version': 'version:1.0-beta-6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api', + 'version': 'version:1.0-beta-6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { 'packages': [ { @@ -2306,6 +2542,39 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default', + 'version': 'version:1.0-alpha-9-stable-1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation', + 'version': 'version:1.11-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils', + 'version': 'version:1.5.15-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/org_jdom_jdom2': { 'packages': [ { @@ -2460,6 +2729,127 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_robolectric_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_junit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_pluginapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_resources': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_robolectric': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_sandbox': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_shadowapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_shadows_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_robolectric_utils_reflector': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', + 'version': 'version:4.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + # === ANDROID_DEPS Generated Code End === } diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 9ecf0afb34..f4d05c1fde 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -322,6 +322,7 @@ if (is_android) { ":video_java", "//modules/audio_device:audio_device_java", "//rtc_base:base_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_support_annotations_java", ] srcjar_deps = [