diff --git a/DEPS b/DEPS index 89f7d597b1..83f93c9be6 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': '8524e2adedb126d2e01c79cc047dc49002d44a93', + 'chromium_revision': 'e839e7281849a36d25ffe961c0075161a49cc6c6', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -24,7 +24,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': 'e1fc0b0b3dfcb5f4bfff02f30566b950aaa06c3f', + 'catapult_revision': '63e0762df0c5f474b5a9eceb25251d6f06a73aa3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -44,7 +44,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling GN CIPD package version # and whatever else without interference from each other. - 'gn_version': 'git_revision:0790d3043387c762a6bacb1ae0a9ebe883188ab2', + 'gn_version': 'git_revision:64b846c96daeb3eaf08e26d8a84d8451c6cb712b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling android_sdk_build-tools_version # and whatever else without interference from each other. @@ -86,11 +86,11 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '4d7d3409f754d9832f28464bafe9f54f58444ee8', + Var('chromium_git') + '/chromium/src/base' + '@' + 'd04d0d427924a116c04137facd65fdf173cf33bf', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'c2f2e5ab0f55d66e60294960cd1ffed7cd3ecebd', + Var('chromium_git') + '/chromium/src/build' + '@' + '6fdec9fe122f25445c4b11062a0ea756e9a1f77f', 'src/buildtools': - Var('chromium_git') + '/chromium/src/buildtools' + '@' + '459baaf66bee809f6eb288e0215cf524f4d2429a', + Var('chromium_git') + '/chromium/src/buildtools' + '@' + '218cb3d12efc52e79dbaf9f8d52d721d8b5a45a7', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' + @@ -98,13 +98,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'b5be7e7906c5dafdffd53d307da7015d98d3af3d', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'db67ecd5ebb34a0d47698b7efbc301d62b6aeb37', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '946f8325846a29a7782c4ba6cbc27879e2f5feec', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'cac71cb59f2a72fbe9c3d79645e6ac75203ea3c0', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '8ae85677bd676df6fbc9b4a7053e19f7d26baba0', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '7b588e18a30502e82355ea7577f11d788dfb41fa', 'src/buildtools/linux64': { 'packages': [ @@ -140,7 +140,7 @@ deps = { 'src/buildtools/clang_format/script': Var('chromium_git') + '/chromium/llvm-project/cfe/tools/clang-format.git' + '@' + '96636aa0e9f047f17447f2d45a094d0b59ed7917', 'src/buildtools/third_party/libc++/trunk': - Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' + '955113db37563c8632e31ddcff2047845553d7ff', + Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' + 'fbddc46986100095d5f7ed1bc2bf795d3bb3e9e4', 'src/buildtools/third_party/libc++abi/trunk': Var('chromium_git') + '/chromium/llvm-project/libcxxabi.git' + '@' + '0d529660e32d77d9111912d73f2c74fc5fa2a858', 'src/buildtools/third_party/libunwind/trunk': @@ -199,7 +199,7 @@ deps = { 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '865445eb8a457bd1acf643d427e722f640c31f6f', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'b8268cad11b722e682b519f78990205f3f98f6c0', 'src/third_party/errorprone/lib': { 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', @@ -312,7 +312,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + 'f05d4a5db94be3412b56bd67043f963a6d855a26', + Var('chromium_git') + '/chromium/src/tools' + '@' + '75c78ba59501f006b020b494af2aab3350e418b2', 'src/tools/swarming_client': Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), @@ -587,7 +587,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -598,7 +598,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/android_arch_lifecycle_common_java8': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -609,7 +620,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android',