Roll chromium_revision af7f3f9345..f031fbef87 (1339036:1343352)
Change log: https://chromium.googlesource.com/chromium/src/+log/af7f3f9345..f031fbef87
Full diff: https://chromium.googlesource.com/chromium/src/+/af7f3f9345..f031fbef87
Changed dependencies
* fuchsia_version: version:22.20240801.2.1..version:23.20240815.4.1
* reclient_version: re_client_version:0.155.0.f89f6fe3-gomaip..re_client_version:0.157.0.d2566cec-gomaip
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/b8c2232900..c79f2cf1aa
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/f513056e19..4a4042e134
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/1926812554..d6d7cf19f0
* src/buildtools/linux64: git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276..git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79
* src/buildtools/mac: git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276..git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79
* src/buildtools/reclient: re_client_version:0.155.0.f89f6fe3-gomaip..re_client_version:0.157.0.d2566cec-gomaip
* src/buildtools/win: git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276..git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/cd805e94ec..0d282e9aae
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/f8da9e037e..9a7b9f09db
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/8759cb0df3..24ddd89921
* src/third_party/androidx/cipd: CC-HiuDii7JswuvWjXQur3fE6jiFKEHspEJlVlnvmd0C..C-tBCqEcdq5_2GSuLyCm3O1N2fDEtO0PzD3S5CJOUWEC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/f01108e476..11f334121f
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2feeb46c60..799e21b232
* src/third_party/dav1d/libdav1d: https://chromium.googlesource.com/external/github.com/videolan/dav1d.git/+log/2355eeb8f2..5ef6b241f0
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/75932421da..caa77da956
* src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/67060f141b..14d16cd143
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/ec378cecaf..f92c96550a
* src/third_party/jdk/current: BXZwbslDFpYhPRuG8hBh2z7ApP36ZG-ZfkBWrkpnPl4C..sewpT0JmZAgFX_ZzmWhbYPmcPGeDa9os_4Q74ZFbo5sC
* src/third_party/kotlin_stdlib: qtDQdcYfgSh4FeSY3TnkSjnZ5FqCbP1kjk1Zj1m6Jd4C..LPDM6HLFsJuO_Crq0eaKCdr056AgYZ7Jz_D8NYTxragC
* src/third_party/kotlinc/current: dsxRhKDTq0fkLEZLBAcBOaGkoSlvPe_gpTl3o680x7MC..WZnvRnrRxAH_l-qK9RKczWmyPdblSiz87bSG3naRB9QC
* src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/d8ef6563e0..f6b976de02
* src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/7993b2fda2..627bf9cce8
* src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/a6a2ec654b..679e851f65
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/8c29d5e1fe..8cd7489ada
* src/third_party/r8: QtuJZ4FItKaGzvgYY4l_aNZxhg-fSMmRkva2D9sK7KcC..GfHHDCcOQaFctqz13NnLVKOtNvvl6ojpI734A9GhuUQC
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/2dc218958f..79b0e0e577
* src/tools/luci-go: git_revision:be41b8d978e22d396ecb4aa9f50ddc3f25977359..git_revision:ad7b787aa0ee53a81bc88fb4f7fee7a3ff1e8c29
* src/tools/luci-go: git_revision:be41b8d978e22d396ecb4aa9f50ddc3f25977359..git_revision:ad7b787aa0ee53a81bc88fb4f7fee7a3ff1e8c29
Removed dependencies
* src/third_party/android_deps/cipd/libs/com_github_ben_manes_caffeine_caffeine
* src/third_party/android_deps/cipd/libs/com_github_kevinstern_software_and_algorithms
* src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotation
* src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_check_api
* src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_core
* src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_type_annotations
* src/third_party/android_deps/cipd/libs/com_google_errorprone_javac
* src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_java
* src/third_party/android_deps/cipd/libs/io_github_java_diff_utils_java_diff_utils
* src/third_party/android_deps/cipd/libs/org_checkerframework_dataflow_errorprone
* src/third_party/android_deps/cipd/libs/org_eclipse_jgit_org_eclipse_jgit
* src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7
* src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8
* src/third_party/android_deps/cipd/libs/org_pcollections_pcollections
DEPS diff: https://chromium.googlesource.com/chromium/src/+/af7f3f9345..f031fbef87/DEPS
No update to Clang.
BUG=None
Change-Id: Ia618cbadf50c244eb58c2f3f2825b9e537f06630
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359900
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42804}
diff --git a/DEPS b/DEPS
index 56581f5..4b754f8 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': 'af7f3f934503598ece54fac9da3fcb2c2fab4a57',
+ 'chromium_revision': 'f031fbef877a07476fce8d14213e9c2ba98d3ca8',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with
@@ -30,7 +30,7 @@
# By default, download the fuchsia sdk from the public sdk directory.
'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/',
- 'fuchsia_version': 'version:22.20240801.2.1',
+ 'fuchsia_version': 'version:23.20240815.4.1',
# By default, download the fuchsia images from the fuchsia GCS bucket.
'fuchsia_images_bucket': 'fuchsia',
'checkout_fuchsia': False,
@@ -45,7 +45,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.155.0.f89f6fe3-gomaip',
+ 'reclient_version': 're_client_version:0.157.0.d2566cec-gomaip',
# ninja CIPD package.
'ninja_package': 'infra/3pp/tools/ninja/',
@@ -61,30 +61,30 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@b8c2232900408c4ebaa553853abde978cd9d30d7',
+ 'https://chromium.googlesource.com/chromium/src/base@c79f2cf1aaff54ffde7d3416f60d7b2874415d4d',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@f513056e199b26044be641df8f4cee18ce222243',
+ 'https://chromium.googlesource.com/chromium/src/build@4a4042e134673ed8f9dafc35aa1eb4b40314254e',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@19268125543e152a215808913dacafe77ecae63f',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@d6d7cf19f05ac770014d71804fbf459557d0a83b',
# 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@cd805e94ec7112fee52d79fd95379d5fe842738b',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@0d282e9aaefe740e4d0f748ebfd25a8e792e6976',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@f8da9e037ec76c08127993f29f9bb96cacbcc513',
+ 'https://chromium.googlesource.com/chromium/src/testing@9a7b9f09dbd186f42eb753bc313ae0a883bd85b3',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@8759cb0df33e4dfe4ede029ea400ba9ccea27d5c',
+ 'https://chromium.googlesource.com/chromium/src/third_party@24ddd8992187aaeb0a126879252cabce42fec51e',
'src/buildtools/linux64': {
'packages': [
{
'package': 'gn/gn/linux-${{arch}}',
- 'version': 'git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276',
+ 'version': 'git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79',
}
],
'dep_type': 'cipd',
@@ -94,7 +94,7 @@
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
- 'version': 'git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276',
+ 'version': 'git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79',
}
],
'dep_type': 'cipd',
@@ -104,7 +104,7 @@
'packages': [
{
'package': 'gn/gn/windows-amd64',
- 'version': 'git_revision:05eed8f6252e2dd6b555e0b65192ef03e2c4a276',
+ 'version': 'git_revision:32f63e70484f43dd671abd15e5804bd0ef72ea79',
}
],
'dep_type': 'cipd',
@@ -126,7 +126,7 @@
'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@7993b2fda28215023f8e0a1f6d0adc48812dc9f0',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@627bf9cce8998515159693e44bcb6e0d734fcb01',
'src/third_party/libc++abi/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@eb6567388e89d9730c76dee71d68ac82e4a1abf6',
'src/third_party/libunwind/src':
@@ -157,16 +157,17 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_system_sdk': {
+ 'src/third_party/android_system_sdk/cipd': {
'packages': [
{
'package': 'chromium/third_party/android_system_sdk/public',
'version': 'XzzECzCzGLrccJS1U-HdmM5VMh9BotgQ_mWhFQ464PwC',
},
],
- 'condition': 'checkout_android',
+ 'condition': 'checkout_android and non_git_source',
'dep_type': 'cipd',
},
+
'src/tools/resultdb': {
'packages': [
{
@@ -188,7 +189,7 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_build_tools/bundletool': {
+ 'src/third_party/android_build_tools/bundletool/cipd': {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/bundletool',
@@ -199,6 +200,28 @@
'dep_type': 'cipd',
},
+ 'src/third_party/android_build_tools/error_prone/cipd': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_build_tools/error_prone',
+ 'version': 'YqeN_FF5AQD-nio02hA2KgnBCJfq7qvNBckmETpkmVUC',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_build_tools/error_prone_javac/cipd': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_build_tools/error_prone_javac',
+ 'version': '7EcHxlEXEaLRWEyHIAxf0ouPjkmN1Od6jkutuo0sfBIC',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
'src/third_party/aosp_dalvik/cipd': {
'packages': [
{
@@ -211,11 +234,11 @@
},
'src/third_party/boringssl/src':
- 'https://boringssl.googlesource.com/boringssl.git@f01108e4761e1d4189cb134322c3cb01dc71ef87',
+ 'https://boringssl.googlesource.com/boringssl.git@11f334121fd0d13830fefdf08041183da2d30ef3',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@1420017c7f9fb910a9ae878d7bf5a6423fba3c59',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@2feeb46c600d86a89b31b6f03050b205f0d4c32a',
+ 'https://chromium.googlesource.com/catapult.git@799e21b232f23f6c1391abfd44fe8ab1dd95bd9b',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -228,9 +251,9 @@
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools':
- 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@75932421da2cd8b5807a4ac52ed2a6f46d7c2120',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@caa77da9568fb7c48c9db679cf9dc0ae20080585',
'src/third_party/ffmpeg':
- 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@67060f141b527403b3f641296bcdaf2a57d19ab2',
+ 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@14d16cd143ad1993900c276e37592956702443a9',
'src/third_party/flatbuffers/src':
'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@fb9afbafc7dfe226b9db54d4923bfb8839635274',
'src/third_party/grpc/src': {
@@ -242,7 +265,7 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@ec378cecaf3cd656a9aa4bf237495d401521ae21',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@f92c96550ad763639158587974cf11067ace743d',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@1da053e87f0487382404656edca98b85fe51f2fd',
'src/third_party/google_benchmark/src': {
@@ -264,7 +287,7 @@
'packages': [
{
'package': 'chromium/third_party/jdk',
- 'version': 'BXZwbslDFpYhPRuG8hBh2z7ApP36ZG-ZfkBWrkpnPl4C',
+ 'version': 'sewpT0JmZAgFX_ZzmWhbYPmcPGeDa9os_4Q74ZFbo5sC',
},
],
'condition': 'host_os == "linux" and checkout_android',
@@ -293,7 +316,7 @@
'packages': [
{
'package': 'chromium/third_party/kotlin_stdlib',
- 'version': 'qtDQdcYfgSh4FeSY3TnkSjnZ5FqCbP1kjk1Zj1m6Jd4C',
+ 'version': 'LPDM6HLFsJuO_Crq0eaKCdr056AgYZ7Jz_D8NYTxragC',
},
],
'condition': 'checkout_android',
@@ -304,7 +327,7 @@
'packages': [
{
'package': 'chromium/third_party/kotlinc',
- 'version': 'dsxRhKDTq0fkLEZLBAcBOaGkoSlvPe_gpTl3o680x7MC',
+ 'version': 'WZnvRnrRxAH_l-qK9RKczWmyPdblSiz87bSG3naRB9QC',
},
],
'condition': 'checkout_android',
@@ -320,21 +343,21 @@
'src/third_party/libsrtp':
'https://chromium.googlesource.com/chromium/deps/libsrtp.git@7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a',
'src/third_party/dav1d/libdav1d':
- 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1',
+ 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@5ef6b241f05a2b9058b58136da4b25842aefba96',
'src/third_party/libaom/source/libaom':
- 'https://aomedia.googlesource.com/aom.git@d8ef6563e0ac6c1e29b0013dec7b6ce6f302e54d',
+ 'https://aomedia.googlesource.com/aom.git@f6b976de024e998f19d3f8c3ed045e3273fcc288',
'src/third_party/libunwindstack': {
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@a3bb4cd02e0e984a235069f812cbef2b37c389e5',
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@8c29d5e1fe294ed2c3a74ace37a44a7089b13c41',
+ 'https://android.googlesource.com/platform/external/perfetto.git@8cd7489adaaaca84340acf33331ebb66a5d39947',
'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@428f3104fa7259a369e88df30f8b02644c8c1e24',
'src/third_party/libyuv':
- 'https://chromium.googlesource.com/libyuv/libyuv.git@a6a2ec654b1be1166b376476a7555c89eca0c275',
+ 'https://chromium.googlesource.com/libyuv/libyuv.git@679e851f653866a49e21f69fe8380bd20123f0ee',
'src/third_party/lss': {
'url': 'https://chromium.googlesource.com/linux-syscall-support.git@ce877209e11aa69dcfffbd53ef90ea1d07136521',
'condition': 'checkout_android or checkout_linux',
@@ -363,7 +386,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'QtuJZ4FItKaGzvgYY4l_aNZxhg-fSMmRkva2D9sK7KcC',
+ 'version': 'GfHHDCcOQaFctqz13NnLVKOtNvvl6ojpI734A9GhuUQC',
},
],
'condition': 'checkout_android',
@@ -387,7 +410,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@2dc218958f585cd4a4bdcd41c7589dff90af878d',
+ 'https://chromium.googlesource.com/chromium/src/tools@79b0e0e577e89c40bf705527bdf2927125f966d4',
'src/third_party/espresso': {
'packages': [
@@ -426,18 +449,18 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': 'CC-HiuDii7JswuvWjXQur3fE6jiFKEHspEJlVlnvmd0C',
+ 'version': 'C-tBCqEcdq5_2GSuLyCm3O1N2fDEtO0PzD3S5CJOUWEC',
},
],
'condition': 'checkout_android and non_git_source',
'dep_type': 'cipd',
},
- 'src/third_party/android_build_tools/manifest_merger': {
+ 'src/third_party/android_build_tools/manifest_merger/cipd': {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/manifest_merger',
- 'version': 'xoWqP0Bmz9ReU5nL9ems2x3Ir4Ir3PMTLyba0Ibs824C',
+ 'version': 'z0CDHTzBfm_jm8PyBaLVnNtMG-rL8482N85GgcntJFIC',
},
],
'condition': 'checkout_android',
@@ -482,17 +505,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/objenesis': {
- 'packages': [
- {
- 'package': 'chromium/third_party/objenesis',
- 'version': 'tknDblENYi8IaJYyD6tUahUyHYZlzJ_Y74_QZSz4DpIC',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/robolectric': {
'packages': [
{
@@ -530,11 +542,11 @@
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:be41b8d978e22d396ecb4aa9f50ddc3f25977359',
+ 'version': 'git_revision:ad7b787aa0ee53a81bc88fb4f7fee7a3ff1e8c29',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:be41b8d978e22d396ecb4aa9f50ddc3f25977359',
+ 'version': 'git_revision:ad7b787aa0ee53a81bc88fb4f7fee7a3ff1e8c29',
},
],
'dep_type': 'cipd',
@@ -877,28 +889,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/com_github_ben_manes_caffeine_caffeine': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine',
- 'version': 'version:2@2.8.8.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/cipd/libs/com_github_kevinstern_software_and_algorithms': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms',
- 'version': 'version:2@1.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/com_google_android_annotations': {
'packages': [
{
@@ -1295,17 +1285,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotation': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
- 'version': 'version:2@2.19.1.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations': {
'packages': [
{
@@ -1317,50 +1296,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_check_api': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
- 'version': 'version:2@2.11.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_core': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
- 'version': 'version:2@2.11.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_type_annotations': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
- 'version': 'version:2@2.11.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/cipd/libs/com_google_errorprone_javac': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac',
- 'version': 'version:2@9+181-r4173-1.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/com_google_errorprone_javac_shaded': {
'packages': [
{
@@ -1548,17 +1483,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_java': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java',
- 'version': 'version:2@3.19.2.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_javalite': {
'packages': [
{
@@ -1647,17 +1571,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/io_github_java_diff_utils_java_diff_utils': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils',
- 'version': 'version:2@4.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/io_grpc_grpc_api': {
'packages': [
{
@@ -1856,17 +1769,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/org_checkerframework_dataflow_errorprone': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone',
- 'version': 'version:2@3.15.0.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/org_codehaus_mojo_animal_sniffer_annotations': {
'packages': [
{
@@ -1889,17 +1791,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/org_eclipse_jgit_org_eclipse_jgit': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit',
- 'version': 'version:2@4.4.1.201607150455-r.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest': {
'packages': [
{
@@ -1933,28 +1824,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7',
- 'version': 'version:2@1.8.20.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8',
- 'version': 'version:2@1.8.20.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_atomicfu_jvm': {
'packages': [
{
@@ -2120,17 +1989,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/cipd/libs/org_pcollections_pcollections': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections',
- 'version': 'version:2@3.1.4.cr1',
- },
- ],
- 'condition': 'checkout_android and non_git_source',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/cipd/libs/org_robolectric_annotations': {
'packages': [
{
diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py
index 10d6f67..623569c 100755
--- a/tools_webrtc/libs/generate_licenses.py
+++ b/tools_webrtc/libs/generate_licenses.py
@@ -99,6 +99,10 @@
'com_android_support_support_annotations/LICENSE'
],
+ 'android_build_tools.*': [
+ 'third_party/android_build_tools/bundletool/LICENSE'
+ ],
+
# Internal dependencies, licenses are already included by other deps.
'android_deps:com_android_support_support_annotations.*': [],
}
