diff --git a/DEPS b/DEPS index 6255637dd7..1b972dde3b 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': 'a9cc4f47323f082a32b295470855111ecd6427f6', + 'chromium_revision': '31d34f548e4c0b28cc2b71ee22ebfc55158c8ef3', # This can be overridden, e.g. with custom_vars, to download a nonstandard # Xcode version in build/mac_toolchain.py @@ -22,9 +22,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@e8024381661b89837d2accf007b639211e9df402', + 'https://chromium.googlesource.com/chromium/src/base@f2a563ac130cb14acf1b0fdc6c04a543fa194ef2', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@96a67839bb93f187f3e68ff0786728925a56d9db', + 'https://chromium.googlesource.com/chromium/src/build@1a541c15828e268c005eb956adc09816af2b01a5', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@6b951673d17662ea2510995700922657d30f3542', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -33,13 +33,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@420c8e8e9cca3cbd2a593c732dc3ee19fadfa68e', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@3dfe063f28a01b459aa09c6dbf8f10f18afd7ef5', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@0822b567eebf643e98abc723a9d111150c2ee40d', + 'https://chromium.googlesource.com/chromium/src/testing@a711b1132571869bdd7084c86083698671b290a6', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@d26a020617ef76b335c3805405c4b959ae9cb60f', + 'https://chromium.googlesource.com/chromium/src/third_party@38a4b81800ee652f30fe398930a6d0030ec960c9', 'src/buildtools/linux64': { 'packages': [ @@ -208,7 +208,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@350be7ea7229bf9916a236738a1c5ec232d918fc', + 'https://android.googlesource.com/platform/external/perfetto.git@1783b3bd55acbe28e323a0c3db456fad62e7b566', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@de4aedaec33c6c29f882f99a740713596713a1f9', 'src/third_party/libyuv': @@ -265,7 +265,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@04c9d66f3ef10682cd1bed20e2bddcca203b6a25', + 'https://chromium.googlesource.com/chromium/src/tools@ac38d0f35a99cbaededbc45185c3400aad885ef0', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@4c095d04179dc725a300085ae21fe3b79900d072', @@ -1784,7 +1784,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', - 'version': 'version:2.7.0-cr0', + 'version': 'version:2.8.0-cr0', }, ], 'condition': 'checkout_android', @@ -2066,6 +2066,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', + 'version': 'version:1.7-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_code_findbugs_jFormatString': { 'packages': [ { @@ -2147,7 +2158,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', - 'version': 'version:2.3.4-cr0', + 'version': 'version:2.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -2158,7 +2169,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2.3.4-cr0', + 'version': 'version:2.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -2169,7 +2180,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', - 'version': 'version:2.3.4-cr0', + 'version': 'version:2.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -2180,7 +2191,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', - 'version': 'version:2.3.4-cr0', + 'version': 'version:2.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -2191,7 +2202,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', - 'version': 'version:2.3.4-cr0', + 'version': 'version:2.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -2620,29 +2631,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:3.0.0-cr0', + 'version': 'version:2.10.0-cr0', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_checkerframework_dataflow': { + 'src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow', - 'version': 'version:3.0.0-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_checkerframework_javacutil': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_javacutil', - 'version': 'version:3.0.0-cr0', + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded', + 'version': 'version:3.1.2-cr0', }, ], 'condition': 'checkout_android', @@ -2814,39 +2814,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_plumelib_plume_util': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_plumelib_plume_util', - 'version': 'version:1.0.6-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_plumelib_reflection_util': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_plumelib_reflection_util', - 'version': 'version:0.0.2-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_plumelib_require_javadoc': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_plumelib_require_javadoc', - 'version': 'version:0.1.0-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/libs/org_robolectric_annotations': { 'packages': [ { @@ -2990,6 +2957,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_threeten_threeten_extra': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra', + 'version': 'version:1.5.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + # === ANDROID_DEPS Generated Code End === }