From bc383e76d6316cf7ca59c76d18d0d7e61f007780 Mon Sep 17 00:00:00 2001 From: Tom Anderson Date: Fri, 15 Jun 2018 17:40:01 -0700 Subject: [PATCH] Update DEPS necessary to green-up CQ bots BUG=libyuv:795 Change-Id: Ic1eb6eb841e763c0d58e6fb36322addb3956d8f2 Reviewed-on: https://chromium-review.googlesource.com/1103311 Reviewed-by: Frank Barchard Commit-Queue: Frank Barchard --- DEPS | 490 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 471 insertions(+), 19 deletions(-) diff --git a/DEPS b/DEPS index 710a8a2b7..60e437ef6 100644 --- a/DEPS +++ b/DEPS @@ -1,6 +1,5 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '80f0c5570649c35a869429b2ab8c381a0a7246cb', 'swarming_revision': '88229872dd17e71658fe96763feaa77915d8cbd6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss @@ -9,30 +8,34 @@ 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': 'e7298f36f7912f2caa122086cfbe71734d04b73f', + 'catapult_revision': 'f3ce003c2baaf3b2aba669681f832139efe5d773', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '39738e75b27f39d4c0030a0b11d5d2ddd34715f7', + Var('chromium_git') + '/chromium/src/build' + '@' + '8cb53523220fec0dee401d2ee5f046cbf43b0656', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a09e064635a49f08e585e3b173d5fbc3dd3f485e', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5941c1b3df96c1db756a2834343533335c394c4a', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '5f7e36cad6434fd3d65674af96653a23ecc9f694', + Var('chromium_git') + '/chromium/src/testing' + '@' + '60b2c69b17816251c0d20557eb818d26ac7e0fe4', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '2c0ced3ddbf84ce1c0759b277d9538da42f23650', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'e755204b7ae59ba1c63e5720a0420d8661672642', 'src/third_party/catapult': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', + 'src/third_party/freetype/src': + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'a44e20879cefea41663bb36ff4af908cc4146fb8', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '0062e4869f07a3ef235703ddf63af604b712446c', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ba96d0b1161f540656efdaed035b3c062b60e006', + 'src/third_party/harfbuzz-ng/src': + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '957e7756634a4fdf1654041e20e883cf964ecac9', 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd', 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '6202b67fc46a9984097caf237e12e3b8f7a9f7da', + Var('chromium_git') + '/chromium/src/tools' + '@' + '55c65d8fecf04f55f5ba9e14b1fdba170f0202d0', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -52,41 +55,137 @@ deps = { }, # Android deps: - 'src/third_party/auto/src': { - 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', - 'condition': 'checkout_android', + 'src/third_party/accessibility_test_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/accessibility-test-framework', + 'version': 'version:2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', }, 'src/third_party/auto/src': { 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', 'condition': 'checkout_android', }, 'src/base': { - 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'ac3d2b81181b085a9952cb83dba748420eefe691', + 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '733a32608c5cd39c03a578cf6001afc2e6c636a2', 'condition': 'checkout_android', }, + 'src/third_party/bazel': { + 'packages': [ + { + 'package': 'chromium/third_party/bazel', + 'version': 'version:0.10.0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/bouncycastle': { + 'packages': [ + { + 'package': 'chromium/third_party/bouncycastle', + 'version': 'version:1.46-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/android_ndk': { - 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', + 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '5cd86312e794bdf542a3685c6f10cbb96072990b', 'condition': 'checkout_android', }, + 'src/third_party/android_support_test_runner': { + 'packages': [ + { + 'package': 'chromium/third_party/android_support_test_runner', + 'version': 'version:0.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + '9a70d48fcdd68cd0e7e968f342bd767ee6323bd1', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c22a664c39af72dd8f89200220713dcad811300a', 'condition': 'checkout_android', }, + 'src/third_party/byte_buddy': { + 'packages': [ + { + 'package': 'chromium/third_party/byte_buddy', + 'version': 'version:1.4.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/ced/src': { 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9', 'condition': 'checkout_android', }, 'src/third_party/errorprone/lib': { - 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + 'ecc57c2b00627667874744b9ad8efe10734d97a8', + 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', }, 'src/third_party/findbugs': { 'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', }, + 'src/third_party/gson': { + 'packages': [ + { + 'package': 'chromium/third_party/gson', + 'version': 'version:2.8.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/guava': { + 'packages': [ + { + 'package': 'chromium/third_party/guava', + 'version': 'version:23.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/hamcrest': { + 'packages': [ + { + 'package': 'chromium/third_party/hamcrest', + 'version': 'version:1.3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/icu': { 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd888fd2a1be890f4d35e43f68d6d79f42519a357', }, + 'src/third_party/icu4j': { + 'packages': [ + { + 'package': 'chromium/third_party/icu4j', + 'version': 'version:53.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/intellij': { + 'packages': [ + { + 'package': 'chromium/third_party/intellij', + 'version': 'version:12.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/jsr-305/src': { 'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', 'condition': 'checkout_android', @@ -99,18 +198,78 @@ deps = { 'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850', 'condition': 'checkout_android', }, + 'src/third_party/objenesis': { + 'packages': [ + { + 'package': 'chromium/third_party/objenesis', + 'version': 'version:2.4-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/ow2_asm': { + 'packages': [ + { + 'package': 'chromium/third_party/ow2_asm', + 'version': 'version:5.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/r8': { + 'packages': [ + { + 'package': 'chromium/third_party/r8', + 'version': 'version:1.0.30', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/requests/src': { 'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', 'condition': 'checkout_android', }, + 'src/third_party/robolectric': { + 'packages': [ + { + 'package': 'chromium/third_party/robolectric', + 'version': 'version:3.5.1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/robolectric/robolectric': { 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403', 'condition': 'checkout_android', }, + 'src/third_party/sqlite4java': { + 'packages': [ + { + 'package': 'chromium/third_party/sqlite4java', + 'version': 'version:0.282-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/ub-uiautomator/lib': { 'url': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434', 'condition': 'checkout_android', }, + 'src/third_party/xstream': { + 'packages': [ + { + 'package': 'chromium/third_party/xstream', + 'version': 'version:1.4.8-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, # iOS deps: 'src/ios': { @@ -124,6 +283,296 @@ deps = { 'url': Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881', 'condition': 'checkout_win', }, + + # === ANDROID_DEPS Generated Code Start === + # Generated by //tools/android/roll/android_deps/fetch_all.sh + 'src/third_party/android_deps/repository/android_arch_core_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_core_common', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/android_arch_lifecycle_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_common', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/android_arch_lifecycle_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_runtime', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_animated_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_animated_vector_drawable', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_appcompat_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_appcompat_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_cardview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_cardview_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_design': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_design', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_gridlayout_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_gridlayout_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_leanback_v17': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_leanback_v17', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_mediarouter_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_mediarouter_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_multidex': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_multidex', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_palette_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_palette_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_leanback_v17': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_leanback_v17', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_v14': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v14', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_recyclerview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_recyclerview_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_annotations', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_compat', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_core_ui': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_ui', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_core_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_utils', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_fragment': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_fragment', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_media_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_media_compat', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_v13': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v13', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_v4': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v4', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_vector_drawable', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_transition': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_transition', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + # === ANDROID_DEPS Generated Code End === } # Define rules for which include paths are allowed in our source. @@ -331,12 +780,15 @@ hooks = [ ], }, { - 'name': 'Android CIPD Ensure', + # We used to use src as a CIPD root. We moved it to a different directory + # in crrev.com/c/930178 but left the clobber here to ensure that that CL + # could be reverted safely. This can be safely removed once crbug.com/794764 + # is resolved. + 'name': 'Android Clobber Deprecated CIPD Root', 'pattern': '.', 'condition': 'checkout_android', - 'action': ['src/build/cipd/cipd_wrapper.py', - '--chromium-root', 'src', - '--ensure-file', 'src/build/cipd/android/android.ensure', + 'action': ['src/build/cipd/clobber_cipd_root.py', + '--root', 'src', ], }, # Android dependencies. Many are downloaded using Google Storage these days.