diff --git a/DEPS b/DEPS index a6366c29b1..7325436a51 100644 --- a/DEPS +++ b/DEPS @@ -5,16 +5,16 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'dd5a54c29b5eaa6452755a9373ef8d026cc10fb4', + 'chromium_revision': 'ce459ab383c095eb4a4d1d30b870669e1560aa40', } 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@ce806f00e6ef611bd0666aca2cd776f2ef22dbc4', + 'https://chromium.googlesource.com/chromium/src/base@1d6cd336dc5465be130b3799e3ae06ea988460cb', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@2f17606c25956e800b6c4670c294a03620e78551', + 'https://chromium.googlesource.com/chromium/src/build@188f078b2dc5fb5e41d8db415e3662e17f6c4fea', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@afc5b798c72905e85f9991152be878714c579958', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -23,13 +23,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@31829ea7dd800288df28be3dd3061fbf4bd619b3', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@084a00adec13f43904912ef69e3b02409ae1011f', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@403d2930e541c7a69af88869efd8c27a40b04534', + 'https://chromium.googlesource.com/chromium/src/testing@688f493e49cd7753762b7abd37163f0866f4800f', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@18f4ad54fc72cd2c408774dde375e25482b62b4b', + 'https://chromium.googlesource.com/chromium/src/third_party@c6a4254b5ee08c6f79f01aec77152136338864f1', 'src/buildtools/linux64': { 'packages': [ @@ -105,9 +105,9 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@1cc95ac07c17d61bea601832bbdc1f8d13d313db', + 'https://boringssl.googlesource.com/boringssl.git@7e43e2e8eecc9114f829e6d75cc3c04d1af57504', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@2e0a0cb9ad546be8c835e65d7537507cb7896e03', + 'https://chromium.googlesource.com/catapult.git@9508452e18f130c98499cb4c4f1e1efaedee8962', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', 'condition': 'checkout_android', @@ -115,7 +115,7 @@ deps = { '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@ea8b58b970c0c94b4a36270b806ee307547cd77e', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@10e0e6d6c19ac3ca5e1ac5667e7772f65f1f8ff8', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@bcc5d9fec0a32ec5a90b831e5d0414639af34e1f', 'src/third_party/findbugs': { @@ -123,9 +123,9 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@e5038be70414cf66da6c4d5ce4e30375884c30d8', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@d09e8315591bb3b8767185d9abd8c3e40b8cc347', 'src/third_party/harfbuzz-ng/src': - 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@5440313924172e155e34391f033f5e6c5e2390b3', + 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@63b8190db884d9ae88a80336067eab539a44b882', # WebRTC-only dependency (not present in Chromium). 'src/third_party/gtest-parallel': 'https://chromium.googlesource.com/external/github.com/google/gtest-parallel@df0b4e476f98516cea7d593e5dbb0fca44f6ee7f', @@ -140,9 +140,9 @@ deps = { 'dep_type': 'cipd', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@306f3754a71d6d1ac644681d3544d06744914228', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@10b1902d893ea8cc43c69541d70868f91af3646b', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@dbd3825b31041d782c5b504c59dcfb5ac7dda08c', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@9f4020916eb1f28f3666f018fdcbe6c9a37f0e08', }, 'src/third_party/jsr-305/src': { 'url': 'https://chromium.googlesource.com/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919', @@ -176,7 +176,7 @@ deps = { 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@650611720ecc23e0e6b32b0e3100f8b4df91696c', 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@4254ecaa075e672b66b9d723ebdd3d7ed7125055', + 'https://chromium.googlesource.com/webm/libvpx.git@36133b04c0d3f82b16902de2ed57fe58d7c30990', 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@6afd9becdf58822b1da6770598d8597c583ccfad', 'src/third_party/lss': { @@ -220,7 +220,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/robolectric/robolectric': { - 'url': 'https://chromium.googlesource.com/external/robolectric.git@3d6dcabf5521e028c8efc2778ab6bd8c7b6d923c', + 'url': 'https://chromium.googlesource.com/external/robolectric.git@f2df0efb033bb402399ebfb9bf58aefee5cced05', 'condition': 'checkout_android', }, 'src/third_party/ub-uiautomator/lib': { @@ -237,9 +237,9 @@ deps = { '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@39d70a29501d4b2999d4e648ecc16ece9bc76555', + 'https://chromium.googlesource.com/chromium/src/tools@af708e06762e33ce0806f19e6c96e06877e08282', 'src/tools/swarming_client': - 'https://chromium.googlesource.com/infra/luci/client-py.git@885b3febcc170a60f25795304e60927b77d1e92d', + 'https://chromium.googlesource.com/infra/luci/client-py.git@0ac28472d073a515124c85b128c4378a914e0a4d', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -329,17 +329,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/gson': { - 'packages': [ - { - 'package': 'chromium/third_party/gson', - 'version': '681931c9778045903a0ed59856ce2dd8dd7bf7ca', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/guava': { 'packages': [ { @@ -397,10 +386,6 @@ deps = { 'package': 'chromium/third_party/android_sdk/public/sources/android-29', 'version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C', }, - { - 'package': 'chromium/third_party/android_sdk/public/tools', - 'version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC', - }, { 'package': 'chromium/third_party/android_sdk/public/tools-lint', 'version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC', @@ -425,17 +410,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/intellij': { - 'packages': [ - { - 'package': 'chromium/third_party/intellij', - 'version': '77c2721b024b36ee073402c08e6d8428c0295336', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/objenesis': { 'packages': [ { @@ -447,22 +421,11 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/ow2_asm': { - 'packages': [ - { - 'package': 'chromium/third_party/ow2_asm', - 'version': 'GcO_KsVh2dc5GF8PLNKrpDksY_yqfiuZ6wprQw7s1EgC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/robolectric': { 'packages': [ { 'package': 'chromium/third_party/robolectric', - 'version': '1KXoOiNP1a_uZNdM2ybWKwAQNow1dHTXTig-ZK4Xgq8C', + 'version': 'iC6RDM5EH3GEAzR-1shW_Mg0FeeNE5shq1okkFfuuNQC', }, ], 'condition': 'checkout_android', @@ -506,15 +469,15 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:37a855b64d59b7f079c9a0e5368f2757099d14d3', + 'version': 'git_revision:02ba678a47594da180904851f3e6f809da7e0fc5', }, { 'package': 'infra/tools/luci/isolated/${{platform}}', - 'version': 'git_revision:37a855b64d59b7f079c9a0e5368f2757099d14d3', + 'version': 'git_revision:02ba678a47594da180904851f3e6f809da7e0fc5', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:37a855b64d59b7f079c9a0e5368f2757099d14d3', + 'version': 'git_revision:02ba678a47594da180904851f3e6f809da7e0fc5', }, ], 'dep_type': 'cipd', @@ -1066,7 +1029,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_test_core', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1077,7 +1040,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_test_ext_junit', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -1088,7 +1051,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_test_monitor', - 'version': 'version:1.1.0-cr0', + 'version': 'version:1.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1099,7 +1062,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_test_rules', - 'version': 'version:1.1.0-cr0', + 'version': 'version:1.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1110,7 +1073,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_test_runner', - 'version': 'version:1.1.0-cr0', + 'version': 'version:1.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1931,6 +1894,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_code_gson_gson': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', + 'version': 'version:2.8.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_dagger_dagger': { 'packages': [ { @@ -2272,6 +2246,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_jetbrains_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_annotations', + 'version': 'version:13.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib': { 'packages': [ { @@ -2294,6 +2279,61 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_ow2_asm_asm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', + 'version': 'version:7.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_analysis': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', + 'version': 'version:7.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_commons': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', + 'version': 'version:7.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_tree': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', + 'version': 'version:7.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_ow2_asm_asm_util': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', + 'version': 'version:7.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/org_pcollections_pcollections': { 'packages': [ {