Edit
kc3-lang/angle/DEPS
Branch :
-
Show log
Commit
-
Author :
angle-autoroll
Date : 2021-01-06 07:01:32
Hash : a8b962b7
Message : Roll Chromium from 481852c5d89b to 38610c881952 (120 revisions) https://chromium.googlesource.com/chromium/src.git/+log/481852c5d89b..38610c881952 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC ianelliott@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/505140eae0..65cd1b9efa * testing: https://chromium.googlesource.com/chromium/src/testing/+log/c83cdcc501..3c84fe5c3f * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..6c876045de * tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/1c129d6fca..77a111142a No update to Clang. Bug: None Tbr: ianelliott@google.com Change-Id: Ia2de17b882601cc3c149466df58c8537df335e38 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2612765 Reviewed-by: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
- DEPS
-
# This file is used to manage the dependencies of the ANGLE git repo. It is # used by gclient to determine what version of each dependency to check out, and # where. # Avoids the need for a custom root variable. use_relative_paths = True gclient_gn_args_file = 'build/config/gclient_args.gni' vars = { 'android_git': 'https://android.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com', 'chrome_internal_git': 'https://chrome-internal.googlesource.com', 'swiftshader_git': 'https://swiftshader.googlesource.com', # This variable is overrided in Chromium's DEPS file. 'build_with_chromium': False, # Only check out public sources by default. This can be overridden with custom_vars. 'checkout_angle_internal': False, # Version of Chromium our Chromium-based DEPS are mirrored from. 'chromium_revision': '38610c8819525f52c96c244dffbccd9cd8e64322', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, # Current revision of VK-GL-CTS (a.k.a dEQP). 'vk_gl_cts_revision': 'b29bf0434c16796dc48a17a52c7fe219d558af31', # Current revision of googletest. # Note: this dep cannot be auto-rolled b/c of nesting. 'googletest_revision': '4fe018038f87675c083d0cfb6a6b57c274fb1753', # Current revision of Chrome's third_party googletest directory. This # repository is mirrored as a separate repository, with separate git hashes # that don't match the external googletest repository or Chrome. Mirrored # patches will have a different git hash associated with them. # To roll, first get the new hash for chromium_googletest_revision from the # mirror of third_party/googletest located here: # https://chromium.googlesource.com/chromium/src/third_party/googletest/ # Then get the new hash for googletest_revision from the root Chrome DEPS # file: https://source.chromium.org/chromium/chromium/src/+/master:DEPS 'chromium_googletest_revision': 'c20c5a3085ab4d90fdb403e3ac98e7991317dd27', # Current revision of jsoncpp. # Note: this dep cannot be auto-rolled b/c of nesting. 'jsoncpp_revision': '645250b6690785be60ab6780ce4b58698d884d11', # Current revision of Chrome's third_party jsoncpp directory. This repository # is mirrored as a separate repository, with separate git hashes that # don't match the external JsonCpp repository or Chrome. Mirrored patches # will have a different git hash associated with them. # To roll, first get the new hash for chromium_jsoncpp_revision from the # mirror of third_party/jsoncpp located here: # https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/ # Then get the new hash for jsoncpp_revision from the root Chrome DEPS file: # https://source.chromium.org/chromium/chromium/src/+/master:DEPS 'chromium_jsoncpp_revision': '30a6ac108e24dabac7c2e0df4d33d55032af4ee7', # Current revision of patched-yasm. # Note: this dep cannot be auto-rolled b/c of nesting. 'patched_yasm_revision': '720b70524a4424b15fc57e82263568c8ba0496ad', # 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': '6c876045de14333d460a9256ac6d700d94fcd0aa', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling luci-go # and whatever else without interference from each other. 'luci_go': 'git_revision:67aba6e3373bb0b9e3ef9871362045736cd29b6e', } deps = { 'build': { 'url': '{chromium_git}/chromium/src/build.git@65cd1b9efaee2f3a9dc07b01fea37c418d4d8f93', 'condition': 'not build_with_chromium', }, 'buildtools': { 'url': '{chromium_git}/chromium/src/buildtools.git@2277272f7a7978c48f1b2c50d41af83485552235', 'condition': 'not build_with_chromium', }, 'testing': { 'url': '{chromium_git}/chromium/src/testing@3c84fe5c3f2b799674380a19bce8ea3ef50710b9', 'condition': 'not build_with_chromium', }, 'third_party/abseil-cpp': { 'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@78f99e18e967880a0661bd95f7b04ab49989d4f0', 'condition': 'not build_with_chromium', }, 'third_party/android_ndk': { 'url': '{chromium_git}/android_ndk.git@27c0a8d090c666a50e40fceb4ee5b40b1a2d3f87', 'condition': 'checkout_android and not build_with_chromium', }, 'third_party/catapult': { 'url': '{chromium_git}/catapult.git@{catapult_revision}', 'condition': 'not build_with_chromium', }, # Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results. 'third_party/cherry': { 'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc', 'condition': 'not build_with_chromium', }, # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'third_party/dummy_chromium': { 'url': '{chromium_git}/chromium/src.git@{chromium_revision}', 'condition': 'dummy_checkout_chromium', }, 'third_party/fuchsia-sdk': { 'url': '{chromium_git}/chromium/src/third_party/fuchsia-sdk.git@1785f0ac8e1fe81cb25e260acbe7de8f62fa3e44', 'condition': 'checkout_fuchsia and not build_with_chromium', }, # Closed-source OpenGL ES 1.1 Conformance tests. 'third_party/gles1_conform': { 'url': '{chrome_internal_git}/angle/es-cts.git@dc9f502f709c9cd88d7f8d3974f1c77aa246958e', 'condition': 'checkout_angle_internal', }, # glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing. 'third_party/glmark2/src': { 'url': '{chromium_git}/external/github.com/glmark2/glmark2@9e01aef1a786b28aca73135a5b00f85c357e8f5e', }, 'third_party/googletest': { 'url': '{chromium_git}/chromium/src/third_party/googletest@{chromium_googletest_revision}', 'condition': 'not build_with_chromium', }, # libjpeg_turbo is used by glmark2. 'third_party/libjpeg_turbo': { 'url': '{chromium_git}/chromium/deps/libjpeg_turbo.git@09efc26aff7983f4377a1743a197ca3d74796d7d', 'condition': 'not build_with_chromium', }, 'third_party/libpng/src': { 'url': '{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c', 'condition': 'not build_with_chromium', }, 'third_party/jsoncpp': { 'url': '{chromium_git}/chromium/src/third_party/jsoncpp@{chromium_jsoncpp_revision}', 'condition': 'not build_with_chromium', }, 'third_party/nasm': { 'url': '{chromium_git}/chromium/deps/nasm.git@19f3fad68da99277b2882939d3b2fa4c4b8d51d9', 'condition': 'not build_with_chromium', }, 'third_party/protobuf': { 'url': '{chromium_git}/chromium/src/third_party/protobuf@ec1e3f2e46c26c6443bd0e048928da6b1fd83d48', 'condition': 'not build_with_chromium', }, 'third_party/Python-Markdown': { 'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@2bb7b23b6398f9e79bc2fa8c6bc64a3cf1613ebf', 'condition': 'not build_with_chromium', }, 'third_party/qemu-linux-x64': { 'packages': [ { 'package': 'fuchsia/qemu/linux-amd64', 'version': '9cc486c5b18a0be515c39a280ca9a309c54cf994' }, ], 'condition': 'not build_with_chromium and (host_os == "linux" and checkout_fuchsia)', 'dep_type': 'cipd', }, 'third_party/qemu-mac-x64': { 'packages': [ { 'package': 'fuchsia/qemu/mac-amd64', 'version': '2d3358ae9a569b2d4a474f498b32b202a152134f' }, ], 'condition': 'not build_with_chromium and (host_os == "mac" and checkout_fuchsia)', 'dep_type': 'cipd', }, 'third_party/rapidjson/src': { 'url': '{chromium_git}/external/github.com/Tencent/rapidjson@7484e06c589873e1ed80382d262087e4fa80fb63', }, 'third_party/SwiftShader': { 'url': '{swiftshader_git}/SwiftShader@b9e179f1f239bd1da8fffbd997a41095345d1f6a', 'condition': 'not build_with_chromium', }, 'third_party/VK-GL-CTS/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/VK-GL-CTS@{vk_gl_cts_revision}', }, 'third_party/vulkan-deps': { 'url': '{chromium_git}/vulkan-deps@b08eace32e9cb8dd7dce9866f051558ac57acb15', 'condition': 'not build_with_chromium', }, 'third_party/vulkan_memory_allocator': { 'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@065e739079d9d58bef28ccd793cbf512261f09ed', 'condition': 'not build_with_chromium', }, 'third_party/zlib': { 'url': '{chromium_git}/chromium/src/third_party/zlib@2c183c9f93a328bfb3121284da13cf89a0f7e64a', 'condition': 'not build_with_chromium', }, 'tools/clang': { 'url': '{chromium_git}/chromium/src/tools/clang.git@e8d041d67901b25f45edf798a074ceef529c7d5b', 'condition': 'not build_with_chromium', }, 'tools/clang/dsymutil': { 'packages': [ { 'package': 'chromium/llvm-build-tools/dsymutil', 'version': 'M56jPzDv1620Rnm__jTMYS62Zi8rxHVq7yw0qeBFEgkC', } ], 'condition': 'checkout_mac and not build_with_chromium', 'dep_type': 'cipd', }, 'tools/luci-go': { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', 'version': Var('luci_go'), }, { 'package': 'infra/tools/luci/isolated/${{platform}}', 'version': Var('luci_go'), }, { 'package': 'infra/tools/luci/swarming/${{platform}}', 'version': Var('luci_go'), }, ], 'condition': 'not build_with_chromium', 'dep_type': 'cipd', }, 'tools/mb': { 'url': '{chromium_git}/chromium/src/tools/mb@77a111142a4041dc2f0dabc6cad1ce2ddd8d9feb', 'condition': 'not build_with_chromium', }, 'tools/md_browser': { 'url': '{chromium_git}/chromium/src/tools/md_browser@60141af3603925d99bf3fb22fdfca138416339b1', 'condition': 'not build_with_chromium', }, 'tools/memory': { 'url': '{chromium_git}/chromium/src/tools/memory@71214b910decfe2e7cfc8b0ffc072a1b97da2d36', 'condition': 'not build_with_chromium', }, 'tools/protoc_wrapper': { 'url': '{chromium_git}/chromium/src/tools/protoc_wrapper@203790d7975787dd77c3d870dadb9e4fdc9c907b', 'condition': 'not build_with_chromium', }, 'tools/skia_goldctl/linux': { 'packages': [ { 'package': 'skia/tools/goldctl/linux-amd64', 'version': 'CQ5a33Wu9Sm6bRTrd26RFsJVr42IoKD4Ediyp7eyuwwC', }, ], 'dep_type': 'cipd', 'condition': 'checkout_linux and not build_with_chromium', }, 'tools/skia_goldctl/win': { 'packages': [ { 'package': 'skia/tools/goldctl/windows-amd64', 'version': 'slJNuZyzBI9lNI9Uje1a2fiVtubv8LEBgUZLFdHZjssC', }, ], 'dep_type': 'cipd', 'condition': 'checkout_win and not build_with_chromium', }, 'tools/skia_goldctl/mac': { 'packages': [ { 'package': 'skia/tools/goldctl/mac-amd64', 'version': 'AXBg8ZzAzlIdv0U_KR8dr92w1szmAp-MB0Z9ZYBmFy4C', }, ], 'dep_type': 'cipd', 'condition': 'checkout_mac and not build_with_chromium', }, } hooks = [ # Pull clang-format binaries using checked-in hashes. { 'name': 'clang_format_win', 'pattern': '.', 'condition': 'host_os == "win" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=win32', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'buildtools/win/clang-format.exe.sha1', ], }, { 'name': 'clang_format_mac', 'pattern': '.', 'condition': 'host_os == "mac" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=darwin', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'buildtools/mac/clang-format.sha1', ], }, { 'name': 'clang_format_linux', 'pattern': '.', 'condition': 'host_os == "linux" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'buildtools/linux64/clang-format.sha1', ], }, { 'name': 'sysroot_x86', 'pattern': '.', 'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and not build_with_chromium)', 'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py', '--arch=x86'], }, { 'name': 'sysroot_x64', 'pattern': '.', 'condition': 'checkout_linux and (checkout_x64 and not build_with_chromium)', 'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py', '--arch=x64'], }, { # Update the Windows toolchain if necessary. Must run before 'clang' below. 'name': 'win_toolchain', 'pattern': '.', 'condition': 'checkout_win and not build_with_chromium', 'action': ['python', 'build/vs_toolchain.py', 'update', '--force'], }, { # Update the Mac toolchain if necessary. 'name': 'mac_toolchain', 'pattern': '.', 'condition': 'checkout_mac and not build_with_chromium', 'action': ['python', 'build/mac_toolchain.py'], }, { # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang', 'pattern': '.', 'action': ['python', 'tools/clang/scripts/update.py'], 'condition': 'not build_with_chromium', }, { # Update LASTCHANGE. 'name': 'lastchange', 'pattern': '.', 'condition': 'not build_with_chromium', 'action': ['python', 'build/util/lastchange.py', '-o', 'build/util/LASTCHANGE'], }, # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', 'pattern': '.', 'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)', 'action': [ 'download_from_google_storage', '--no_resume', '--no_auth', '--bucket', 'chromium-browser-clang/rc', '-s', 'build/toolchain/win/rc/win/rc.exe.sha1', ], }, { 'name': 'fuchsia_sdk', 'pattern': '.', 'condition': 'checkout_fuchsia and not build_with_chromium', 'action': [ 'python', 'build/fuchsia/update_sdk.py', ], }, # Download glslang validator binary for Linux. { 'name': 'linux_glslang_validator', 'pattern': '.', 'condition': 'checkout_linux and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'angle-glslang-validator', '-s', 'tools/glslang/glslang_validator.sha1', ], }, # Download glslang validator binary for Windows. { 'name': 'win_glslang_validator', 'pattern': '.', 'condition': 'checkout_win and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=win32*', '--no_auth', '--bucket', 'angle-glslang-validator', '-s', 'tools/glslang/glslang_validator.exe.sha1', ], }, # Download flex/bison binaries for Linux. { 'name': 'linux_flex_bison', 'pattern': '.', 'condition': 'checkout_linux and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'angle-flex-bison', '-d', 'tools/flex-bison/linux/', ], }, # Download flex/bison binaries for Windows. { 'name': 'win_flex_bison', 'pattern': '.', 'condition': 'checkout_win and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=win32*', '--no_auth', '--bucket', 'angle-flex-bison', '-d', 'tools/flex-bison/windows/', ], }, # Download internal captures for perf tests { 'name': 'restricted_traces', 'pattern': '\\.sha1', 'condition': 'checkout_angle_internal', 'action': [ 'vpython3', 'src/tests/restricted_traces/download_restricted_traces.py', 'src/tests/restricted_traces', ] } ] recursedeps = [ # buildtools provides clang_format. 'buildtools', 'third_party/googletest', 'third_party/jsoncpp', 'third_party/vulkan-deps', ]