From 498aceb3d848865b8e6d9fac2adcc3331e95c404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Thu, 30 Aug 2018 14:08:53 +0200 Subject: [PATCH] Roll chromium_revision 33a17747bb2..c1d47013a1 (585798:585833) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual changes: * Added dagger libs Change log: https://chromium.googlesource.com/chromium/src/+log/33a17747bb2..c1d47013a1 Full diff: https://chromium.googlesource.com/chromium/src/+/33a17747bb2..c1d47013a1 * src/base: https://chromium.googlesource.com/chromium/src/base/+log/7cf937ddfda06..bc614f359d * src/build: https://chromium.googlesource.com/chromium/src/build/+log/53a2dfe471..57d26a0c82f1 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/34ebe8d53e2c..577dec8385d * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/951cbbaec1c..c1acec6a * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/0181226..86ee5d2701a9 No update to Clang. TBR=phoglund@webrtc.org CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Bug: None Change-Id: I53a1eb04ebb879cb86095c416dfd1f28ce7b7e36 Reviewed-on: https://webrtc-review.googlesource.com/96821 Commit-Queue: Patrik Höglund Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#24497} --- DEPS | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 19 deletions(-) diff --git a/DEPS b/DEPS index 0c8e883ec3..8e8c9241e3 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': '33a17747bb2233da0b14dd5e9cee306a80aa9148', + 'chromium_revision': 'c1d4701', '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': 'a9a4168ab6e9514493c87e3d301bfa27c60477f9', + 'catapult_revision': '1e44d066259f5d35087c43fa910e680dcb4c229e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -42,9 +42,9 @@ 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' + '@' + '7cf937ddfda06bd68c3fbc470938e23bda37609e', + Var('chromium_git') + '/chromium/src/base' + '@' + 'bc614f359d6d4b943342110f212bb6426cef89af', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '53a2dfe471036b09135563819e49e44dfd8b4295', + Var('chromium_git') + '/chromium/src/build' + '@' + '57d26a0c82f1846e77f70095079398d375ace8fa', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '2dff9c9c74e9d732e6fe57c84ef7fd044cc45d96', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -54,13 +54,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '34ebe8d53e2c7adb1c4a0d2eab4b8829323404b8', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '577dec8385de59bd2df3cb8d7d149cf896aeb4d8', 'condition': 'checkout_ios', }, 'src/testing': Var('chromium_git') + '/chromium/src/testing' + '@' + '9369f699ceb229e54de74efb3f83cb5c3f3fbaad', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '951cbbaec1c91c34608031c374574c72217a2176', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'c1acec6af3a8833622faf6a19761c430056d45ac', 'src/third_party/android_ndk': { 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884', 'condition': 'checkout_android', @@ -131,7 +131,7 @@ deps = { 'src/third_party/libFuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'), 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '9977619490e12dafdb6699ff148fe4e533b74575', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd', 'src/third_party/libsrtp': Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '368abd6bb3091df2b354250818714f72f0692ca5', 'src/third_party/libvpx/source/libvpx': @@ -185,7 +185,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' + '@' + '0181226416473301b60935ee584db7b05fdb8b9c', + Var('chromium_git') + '/chromium/src/tools' + '@' + '86ee5d2701a99a20d87c9e87e7b590841e5b8804', 'src/tools/swarming_client': Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), @@ -321,17 +321,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/javax_inject': { - 'packages': [ - { - 'package': 'chromium/third_party/javax_inject', - 'version': 'version:1-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/objenesis': { 'packages': [ { @@ -857,6 +846,170 @@ deps = { ], 'condition': 'checkout_android', 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_dagger_dagger': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_processor': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_processor', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', + 'version': 'version:9-dev-r4023-3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', + 'version': 'version:1.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_guava_guava': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', + 'version': 'version:25.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_squareup_javapoet': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', + 'version': 'version:1.11.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_annotation_jsr250_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', + 'version': 'version:1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_inject_javax_inject': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', + 'version': 'version:1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', }, # === ANDROID_DEPS End === }