Roll chromium_revision 9970bfaf36..2a9688b355 (1060318:1063242)
Manually updated the flatbuffer dependency. Change log:9970bfaf36..2a9688b355Full diff:9970bfaf36..2a9688b355Changed dependencies * src/base:1cbb338b1c..25be473469* src/build:2cf254f018..35368b635a* src/buildtools:ca6213a9de..4c4e17b5b6* src/buildtools/linux64: git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4..git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f * src/buildtools/mac: git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4..git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f * src/buildtools/third_party/libc++/trunk:e6caea47f8..0487904cc4* src/buildtools/third_party/libc++abi/trunk:685c4ad257..519e9ef6cc* src/buildtools/third_party/libunwind/trunk:1111799723..1f633d41a0* src/buildtools/win: git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4..git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f * src/ios:35f415a5a1..d85cca59d4* src/testing:63ba9bd34f..e94e58aa8b* src/third_party:5f6d1ab1d7..238e09dbeb* src/third_party/android_build_tools/bundletool: IEZQhHFQzO9Ci1QxWZmssKqGmt2r_nCDMKr8t4cKY34C..JUxLsQLBkNG0ylmbHz6FGBtYyK1PNDZ04pMCii90Bd4C * src/third_party/android_build_tools/manifest_merger: bfhl7B4_T6dP72d1sF-6RSeAQqwlw1qUx-FDEFh3sKIC..xd-wXGBtd-G1FJXc_owo3j_wxWs4YxgOfQ-tKWHwN5AC * src/third_party/androidx: ZwzuDdR1SOsOlDfzEXAOd5iZO93YIoOD9Xyvmszyb00C..WCW0Nb-eTWmZ-0JKKiQ9oxO3tAIKly0B_mFX8It3Y9sC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/98d333e8ae..cf46d1667f * src/third_party/depot_tools:c950858a72..1f51102073* src/third_party/freetype/src:8493877e78..dea2e6358b* src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/7f32eb35ff..08ea764546 * src/third_party/libvpx/source/libvpx:9d6d0624d7..5245f6e9cb* src/third_party/libyuv:00950840d1..fe9ced6e3c* src/third_party/nasm:5fd9246276..9215e8e1d0* src/third_party/perfetto:a77a3622d2..05595662ce* src/third_party/r8/d8: 9PJITrOEIl2U8mvr44d5e9XjOdvzRPuF774VA3jWOsYC..fGg1w2Oj2oVLbC_e3xNqEiugIZSwvIT2ji8y_br-eRQC * src/tools:72185140dd..a0b8069951* src/tools/luci-go: git_revision:9f65ffe719f73af390727d369b342c22fa37ea54..git_revision:50ab33853a8b220162f851dcb74a1519e106b3df * src/tools/luci-go: git_revision:9f65ffe719f73af390727d369b342c22fa37ea54..git_revision:50ab33853a8b220162f851dcb74a1519e106b3df DEPS diff:9970bfaf36..2a9688b355/DEPS Clang version changed llvmorg-16-init-7184-gdeb82d4a:llvmorg-16-init-8189-g97196a2d Details:9970bfaf36..2a9688b355/tools/clang/scripts/update.py BUG=None Change-Id: If4aefeae31bbee1dcc320a049f55672cf27e74a3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280381 Reviewed-by: Christoffer Jansson <jansson@google.com> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38473}
This commit is contained in:
parent
d237c2bd2d
commit
3282747466
69
DEPS
69
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': '9970bfaf3635bbaacf8c1fe91f809d9e4903102e',
|
||||
'chromium_revision': '2a9688b3559317dc501e89bad708a1ebf6d09b19',
|
||||
|
||||
# Keep the Chromium default of generating location tags.
|
||||
'generate_location_tags': True,
|
||||
@ -37,30 +37,30 @@ vars = {
|
||||
deps = {
|
||||
# TODO(kjellander): Move this to be Android-only.
|
||||
'src/base':
|
||||
'https://chromium.googlesource.com/chromium/src/base@1cbb338b1c607de3019251d026012c150edf1467',
|
||||
'https://chromium.googlesource.com/chromium/src/base@25be473469e3755379e659324ce51fed232d6cd7',
|
||||
'src/build':
|
||||
'https://chromium.googlesource.com/chromium/src/build@2cf254f018ff21ecffb42da96ea818eff3afb980',
|
||||
'https://chromium.googlesource.com/chromium/src/build@35368b635aab6793651b488b02273cfe6775e4d0',
|
||||
'src/buildtools':
|
||||
'https://chromium.googlesource.com/chromium/src/buildtools@ca6213a9de4f77e18219d822e1574bf40354da13',
|
||||
'https://chromium.googlesource.com/chromium/src/buildtools@4c4e17b5b6be7e1908c389f07d87c8536b5d331c',
|
||||
# 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@35f415a5a1785a1eddd21265c33e60b20e6cd41c',
|
||||
'url': 'https://chromium.googlesource.com/chromium/src/ios@d85cca59d4f8eb24163fc3117ffaa2b9174cf999',
|
||||
'condition': 'checkout_ios',
|
||||
},
|
||||
'src/testing':
|
||||
'https://chromium.googlesource.com/chromium/src/testing@63ba9bd34f59344c066cf15def9ed23e6a1830b4',
|
||||
'https://chromium.googlesource.com/chromium/src/testing@e94e58aa8b92eac29623a81efb04e1469444b3dc',
|
||||
'src/third_party':
|
||||
'https://chromium.googlesource.com/chromium/src/third_party@5f6d1ab1d78c2c2058822c00f98e4a79343bc768',
|
||||
'https://chromium.googlesource.com/chromium/src/third_party@238e09dbeb7cd86d76c729bd979ca352819e5efd',
|
||||
|
||||
'src/buildtools/linux64': {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'gn/gn/linux-${{arch}}',
|
||||
'version': 'git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4',
|
||||
'version': 'git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f',
|
||||
}
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@ -70,7 +70,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'gn/gn/mac-${{arch}}',
|
||||
'version': 'git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4',
|
||||
'version': 'git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f',
|
||||
}
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@ -80,7 +80,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'gn/gn/windows-amd64',
|
||||
'version': 'git_revision:57c352b2b03461c24b19c678c61d7aeacc6981f4',
|
||||
'version': 'git_revision:7a6231e3e43845d9aa298bb040f11dd1953e966f',
|
||||
}
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@ -99,11 +99,11 @@ deps = {
|
||||
'src/buildtools/clang_format/script':
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@8b525d2747f2584fc35d8c7e612e66f377858df7',
|
||||
'src/buildtools/third_party/libc++/trunk':
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@e6caea47f873bd039e10e3e178112225a0d959fa',
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@0487904cc4ea484bf3798d1101da8786a42bb716',
|
||||
'src/buildtools/third_party/libc++abi/trunk':
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@685c4ad257da543bdf9e3a391c28b3e4ac1f8aac',
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@519e9ef6cc1c284bb1ee13540f123cdc4c269224',
|
||||
'src/buildtools/third_party/libunwind/trunk':
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@1111799723f6a003e6f52202b9bf84387c552081',
|
||||
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@1f633d41a035b91bbff4cb02f7f549a856dee6fa',
|
||||
|
||||
'src/third_party/ninja': {
|
||||
'packages': [
|
||||
@ -150,7 +150,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/android_build_tools/bundletool',
|
||||
'version': 'IEZQhHFQzO9Ci1QxWZmssKqGmt2r_nCDMKr8t4cKY34C',
|
||||
'version': 'JUxLsQLBkNG0ylmbHz6FGBtYyK1PNDZ04pMCii90Bd4C',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
@ -162,7 +162,7 @@ deps = {
|
||||
'src/third_party/breakpad/breakpad':
|
||||
'https://chromium.googlesource.com/breakpad/breakpad.git@e085b3b50bde862d0cf3ce4594e3f391bcf5faec',
|
||||
'src/third_party/catapult':
|
||||
'https://chromium.googlesource.com/catapult.git@98d333e8aebd9658a465e71e51214072b0ac205e',
|
||||
'https://chromium.googlesource.com/catapult.git@cf46d1667f2a893d9f9f1e0570f14574c4ea2bd6',
|
||||
'src/third_party/ced/src': {
|
||||
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
|
||||
},
|
||||
@ -171,9 +171,11 @@ deps = {
|
||||
'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@c950858a721bfa70ac7b4aa3faefeb42f3a3937a',
|
||||
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@1f511020737b695f4cbb3260fdaef78a29acdd35',
|
||||
'src/third_party/ffmpeg':
|
||||
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@b9f01c3c54576330b2cf8918c54d5ee5be8faefe',
|
||||
'src/third_party/flatbuffers/src':
|
||||
'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@e3017029647a88eb6f509ee9744012fffeb0d371',
|
||||
'src/third_party/grpc/src': {
|
||||
'url': 'https://chromium.googlesource.com/external/github.com/grpc/grpc.git@dd77c67217b10ffeaf766e25eb8b46d2d59de4ff',
|
||||
},
|
||||
@ -183,7 +185,7 @@ deps = {
|
||||
'condition': 'checkout_linux',
|
||||
},
|
||||
'src/third_party/freetype/src':
|
||||
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@8493877e78596cf7fe8eb008708070e3852d104a',
|
||||
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@dea2e6358b2f963008d447d27564dd79890b61f0',
|
||||
'src/third_party/harfbuzz-ng/src':
|
||||
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@56c467093598ec559a7148b61e112e9de52b7076',
|
||||
'src/third_party/google_benchmark/src': {
|
||||
@ -233,17 +235,17 @@ deps = {
|
||||
'src/third_party/dav1d/libdav1d':
|
||||
'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@87f9a81cd770e49394a45deca7a3df41243de00b',
|
||||
'src/third_party/libaom/source/libaom':
|
||||
'https://aomedia.googlesource.com/aom.git@7f32eb35ff2589369f095388701e3dfc4d6a9381',
|
||||
'https://aomedia.googlesource.com/aom.git@08ea76454668e4f6b51755ee668308b248181d78',
|
||||
'src/third_party/libunwindstack': {
|
||||
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@4dbfa0e8c844c8e243b297bc185e54a99ff94f9e',
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/third_party/perfetto':
|
||||
'https://android.googlesource.com/platform/external/perfetto.git@a77a3622d28b8ae7df746b6591de7b390c3b342a',
|
||||
'https://android.googlesource.com/platform/external/perfetto.git@05595662ce61973229156fed585b735bcebd9014',
|
||||
'src/third_party/libvpx/source/libvpx':
|
||||
'https://chromium.googlesource.com/webm/libvpx.git@9d6d0624d7943a09cc0be9df1a7402522989ac1a',
|
||||
'https://chromium.googlesource.com/webm/libvpx.git@5245f6e9cb7e6bb68ab45fe4d8b00bc9b16857e1',
|
||||
'src/third_party/libyuv':
|
||||
'https://chromium.googlesource.com/libyuv/libyuv.git@00950840d1c9bcbb3eb6ebc5aac5793e71166c8b',
|
||||
'https://chromium.googlesource.com/libyuv/libyuv.git@fe9ced6e3c8ae6c69bcc3ebb8505a650d2df30e0',
|
||||
'src/third_party/lss': {
|
||||
'url': 'https://chromium.googlesource.com/linux-syscall-support.git@ce877209e11aa69dcfffbd53ef90ea1d07136521',
|
||||
'condition': 'checkout_android or checkout_linux',
|
||||
@ -255,7 +257,7 @@ deps = {
|
||||
|
||||
# Used by boringssl.
|
||||
'src/third_party/nasm': {
|
||||
'url': 'https://chromium.googlesource.com/chromium/deps/nasm.git@5fd9246276814b5ebb7e56b821cedeecab9b674d'
|
||||
'url': 'https://chromium.googlesource.com/chromium/deps/nasm.git@9215e8e1d0fe474ffd3e16c1a07a0f97089e6224'
|
||||
},
|
||||
|
||||
'src/third_party/openh264/src':
|
||||
@ -277,7 +279,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/r8',
|
||||
'version': '9PJITrOEIl2U8mvr44d5e9XjOdvzRPuF774VA3jWOsYC',
|
||||
'version': 'fGg1w2Oj2oVLbC_e3xNqEiugIZSwvIT2ji8y_br-eRQC',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
@ -288,7 +290,7 @@ deps = {
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/tools':
|
||||
'https://chromium.googlesource.com/chromium/src/tools@72185140dd94351f8e1ed2810cb6bd6b6d79f08b',
|
||||
'https://chromium.googlesource.com/chromium/src/tools@a0b806995138ccd5ae3c48b7b8e979c915a233a4',
|
||||
|
||||
'src/third_party/accessibility_test_framework': {
|
||||
'packages': [
|
||||
@ -365,7 +367,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/androidx',
|
||||
'version': 'ZwzuDdR1SOsOlDfzEXAOd5iZO93YIoOD9Xyvmszyb00C',
|
||||
'version': 'WCW0Nb-eTWmZ-0JKKiQ9oxO3tAIKly0B_mFX8It3Y9sC',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
@ -376,7 +378,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/android_build_tools/manifest_merger',
|
||||
'version': 'bfhl7B4_T6dP72d1sF-6RSeAQqwlw1qUx-FDEFh3sKIC',
|
||||
'version': 'xd-wXGBtd-G1FJXc_owo3j_wxWs4YxgOfQ-tKWHwN5AC',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
@ -477,11 +479,11 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'infra/tools/luci/isolate/${{platform}}',
|
||||
'version': 'git_revision:9f65ffe719f73af390727d369b342c22fa37ea54',
|
||||
'version': 'git_revision:50ab33853a8b220162f851dcb74a1519e106b3df',
|
||||
},
|
||||
{
|
||||
'package': 'infra/tools/luci/swarming/${{platform}}',
|
||||
'version': 'git_revision:9f65ffe719f73af390727d369b342c22fa37ea54',
|
||||
'version': 'git_revision:50ab33853a8b220162f851dcb74a1519e106b3df',
|
||||
},
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@ -1594,17 +1596,6 @@ deps = {
|
||||
'dep_type': 'cipd',
|
||||
},
|
||||
|
||||
'src/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java': {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java',
|
||||
'version': 'version:2@2.0.3.cr1',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
'dep_type': 'cipd',
|
||||
},
|
||||
|
||||
'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': {
|
||||
'packages': [
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user