Commit 81fa122c authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Reland: Pull libunwind, libcxx, libcxxabi from a different mirror.

Relands https://chromium-review.googlesource.com/c/chromium/src/+/2062879

Bug: 1054245, 1048253
Change-Id: I424802b387fc6e414fc5328052db4e9cecae091e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062580Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743430}
parent 30953dee
......@@ -334,9 +334,11 @@ vars = {
# Also, if you change these, update buildtools/DEPS too. Also update the
# libc++ svn_revision in //buildtools/deps_revisions.gni.
'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
'libcxx_revision': '78d6a7767ed57b50122a161b91f59f19c9bd0d19',
'libcxxabi_revision': '0d529660e32d77d9111912d73f2c74fc5fa2a858',
'libunwind_revision': '69d9b84cca8354117b9fe9705a4430d789ee599b',
# TODO(crbug.com/1054245): Rename these vars back to their original name
# once libassistant's copy of buildtools rolls up to the rename.
'libcxx_revision_v2': 'd9040c75cfea5928c804ab7c235fed06a63f743a',
'libcxxabi_revision_v2': '196ba1aaa8ac285d94f4ea8d9836390a45360533',
'libunwind_revision_v2': '43bb9f872232f531bac80093ceb4de61c64b9ab7',
}
# Only these hosts are allowed for dependencies in this DEPS file.
......@@ -381,14 +383,17 @@ deps = {
'condition': 'host_os == "mac"',
},
'src/buildtools/third_party/libc++/trunk':
Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' +
Var('libcxx_revision'),
Var('chromium_git') +
'/external/github.com/llvm/llvm-project/libcxx.git' + '@' +
Var('libcxx_revision_v2'),
'src/buildtools/third_party/libc++abi/trunk':
Var('chromium_git') + '/chromium/llvm-project/libcxxabi.git' + '@' +
Var('libcxxabi_revision'),
Var('chromium_git') +
'/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' +
Var('libcxxabi_revision_v2'),
'src/buildtools/third_party/libunwind/trunk':
Var('chromium_git') + '/external/llvm.org/libunwind.git' + '@' +
Var('libunwind_revision'),
Var('chromium_git') +
'/external/github.com/llvm/llvm-project/libunwind.git' + '@' +
Var('libunwind_revision_v2'),
'src/buildtools/win': {
'packages': [
{
......
......@@ -4012,8 +4012,10 @@ def _CheckBuildtoolsRevisionsAreInSync(input_api, output_api):
# this presubmit check.
# Update this regexp if new revisions are added to the files.
# TODO(crbug.com/1054245): Remove the optional '_v2' bit.
var_names = ['clang_format', 'libcxx', 'libcxxabi', 'libunwind']
rev_regexp = input_api.re.compile(
"'((clang_format|libcxx|libcxxabi|libunwind)_revision|gn_version)':")
"'((%s)_revision(?:_v2)?|gn_version)':" % '|'.join(var_names))
# If a user is changing one revision, they need to change the same
# line in both files. This means that any given change should contain
......
......@@ -18,9 +18,11 @@ vars = {
# When changing these, also update the svn revisions in deps_revisions.gni
'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
'libcxx_revision': '78d6a7767ed57b50122a161b91f59f19c9bd0d19',
'libcxxabi_revision': '0d529660e32d77d9111912d73f2c74fc5fa2a858',
'libunwind_revision': '69d9b84cca8354117b9fe9705a4430d789ee599b',
# TODO(crbug.com/1054245): Rename these vars back to their original name
# once libassistant's copy of buildtools rolls up to the rename.
'libcxx_revision_v2': 'd9040c75cfea5928c804ab7c235fed06a63f743a',
'libcxxabi_revision_v2': '196ba1aaa8ac285d94f4ea8d9836390a45360533',
'libunwind_revision_v2': '43bb9f872232f531bac80093ceb4de61c64b9ab7',
}
deps = {
......@@ -48,14 +50,17 @@ deps = {
'condition': 'host_os == "mac"',
},
'third_party/libc++/trunk':
Var('chromium_url') + '/chromium/llvm-project/libcxx.git' + '@' +
Var('libcxx_revision'),
Var('chromium_url') +
'/external/github.com/llvm/llvm-project/libcxx.git' + '@' +
Var('libcxx_revision_v2'),
'third_party/libc++abi/trunk':
Var('chromium_url') + '/chromium/llvm-project/libcxxabi.git' + '@' +
Var('libcxxabi_revision'),
Var('chromium_url') +
'/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' +
Var('libcxxabi_revision_v2'),
'third_party/libunwind/trunk':
Var('chromium_url') + '/external/llvm.org/libunwind.git' + '@' +
Var('libunwind_revision'),
Var('chromium_url') +
'/external/github.com/llvm/llvm-project/libunwind.git' + '@' +
Var('libunwind_revision_v2'),
'win': {
'packages': [
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment