summaryrefslogtreecommitdiff
path: root/chromium/buildtools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-16 11:45:35 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-17 08:59:23 +0000
commit552906b0f222c5d5dd11b9fd73829d510980461a (patch)
tree3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/buildtools
parent1b05827804eaf047779b597718c03e7d38344261 (diff)
downloadqtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/buildtools')
-rw-r--r--chromium/buildtools/DEPS17
-rw-r--r--chromium/buildtools/README.txt30
-rw-r--r--chromium/buildtools/linux64/clang-format.sha12
-rw-r--r--chromium/buildtools/mac/clang-format.sha12
-rw-r--r--chromium/buildtools/third_party/libc++/BUILD.gn4
-rw-r--r--chromium/buildtools/third_party/libc++abi/BUILD.gn8
-rw-r--r--chromium/buildtools/win/clang-format.exe.sha12
7 files changed, 20 insertions, 45 deletions
diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS
index 264d3f4e3c7..19a751cb5a6 100644
--- a/chromium/buildtools/DEPS
+++ b/chromium/buildtools/DEPS
@@ -14,13 +14,13 @@ vars = {
#
# GN CIPD package version.
- 'gn_version': 'git_revision:ad9e442d92dcd9ee73a557428cfc336b55cbd533',
+ 'gn_version': 'git_revision:5ed3c9cc67b090d5e311e4bd2aba072173e82db9',
# 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',
+ 'libcxx_revision': 'd9040c75cfea5928c804ab7c235fed06a63f743a',
+ 'libcxxabi_revision': '196ba1aaa8ac285d94f4ea8d9836390a45360533',
+ 'libunwind_revision': '43bb9f872232f531bac80093ceb4de61c64b9ab7',
}
deps = {
@@ -48,13 +48,16 @@ deps = {
'condition': 'host_os == "mac"',
},
'third_party/libc++/trunk':
- Var('chromium_url') + '/chromium/llvm-project/libcxx.git' + '@' +
+ Var('chromium_url') +
+ '/external/github.com/llvm/llvm-project/libcxx.git' + '@' +
Var('libcxx_revision'),
'third_party/libc++abi/trunk':
- Var('chromium_url') + '/chromium/llvm-project/libcxxabi.git' + '@' +
+ Var('chromium_url') +
+ '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' +
Var('libcxxabi_revision'),
'third_party/libunwind/trunk':
- Var('chromium_url') + '/external/llvm.org/libunwind.git' + '@' +
+ Var('chromium_url') +
+ '/external/github.com/llvm/llvm-project/libunwind.git' + '@' +
Var('libunwind_revision'),
'win': {
'packages': [
diff --git a/chromium/buildtools/README.txt b/chromium/buildtools/README.txt
index 30325bf41b2..1a2d5863f78 100644
--- a/chromium/buildtools/README.txt
+++ b/chromium/buildtools/README.txt
@@ -1,35 +1,13 @@
-This repository contains hashes of build tools used by Chromium and related
+This directory contains hashes of build tools used by Chromium and related
projects. The actual binaries are pulled from Google Storage, normally as part
of a gclient hook.
-The repository is separate so that the shared build tools can be shared between
+This directory also exists as a stand-alone git mirror at
+https://chromium.googlesource.com/chromium/src/buildtools/.
+That mirror exists so that the shared build tools can be shared between
the various Chromium-related projects without each one needing to maintain
their own versionining of each binary.
-________________________________________
-UPDATING AND ROLLING BUILDTOOLS MANUALLY
-
-When you update buildtools, you should roll the new version into the Chromium
-repository right away. Otherwise, the next person who makes a change will end
-up rolling (and testing) your change. If there are any unresolved problems with
-your change, the next person will be blocked.
-
- - From the buildtools directory, make a branch, edit and upload normally.
-
- - Get your change reviewed and landed. There are no trybots so landing will
- be very fast.
-
- - Get the hash for the commit that commit-bot made. Make a new branch in
- the Chromium repository and paste the hash into the line in //DEPS
- labeled "buildtools_revision".
-
- - You can TBR changes to the DEPS file since the git hashes can't be reviewed
- in any practical way. Submit that patch to the commit queue.
-
- - If this roll identifies a problem with your patch, fix it promptly. If you
- are unable to fix it promptly, it's best to revert your buildtools patch
- to avoid blocking other people that want to make changes.
-
________________________
ADDING BINARIES MANUALLY
diff --git a/chromium/buildtools/linux64/clang-format.sha1 b/chromium/buildtools/linux64/clang-format.sha1
index e2b3199a05f..62b2d60b586 100644
--- a/chromium/buildtools/linux64/clang-format.sha1
+++ b/chromium/buildtools/linux64/clang-format.sha1
@@ -1 +1 @@
-942fc8b1789144b8071d3fc03ff0fcbe1cf81ac8 \ No newline at end of file
+1baf0089e895c989a311b6a38ed94d0e8be4c0a7 \ No newline at end of file
diff --git a/chromium/buildtools/mac/clang-format.sha1 b/chromium/buildtools/mac/clang-format.sha1
index d32c6265ea8..5ef063b1606 100644
--- a/chromium/buildtools/mac/clang-format.sha1
+++ b/chromium/buildtools/mac/clang-format.sha1
@@ -1 +1 @@
-025ca7c75f37ef4a40f3a67d81ddd11d7d0cdb9b \ No newline at end of file
+62bde1baa7196ad9df969fc1f06b66360b1a927b \ No newline at end of file
diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn
index c16f963bb87..7a4cdd72f2d 100644
--- a/chromium/buildtools/third_party/libc++/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++/BUILD.gn
@@ -173,9 +173,7 @@ target(_libcxx_target_type, "libc++") {
if (!is_win) {
defines += [ "LIBCXX_BUILDING_LIBCXXABI" ]
if (!export_libcxxabi_from_executables) {
- deps = [
- "//buildtools/third_party/libc++abi",
- ]
+ deps = [ "//buildtools/third_party/libc++abi" ]
}
}
}
diff --git a/chromium/buildtools/third_party/libc++abi/BUILD.gn b/chromium/buildtools/third_party/libc++abi/BUILD.gn
index e571b86a424..22517c27682 100644
--- a/chromium/buildtools/third_party/libc++abi/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++abi/BUILD.gn
@@ -15,9 +15,7 @@ source_set("libc++abi") {
# unwinding symbols, unlike Linux does with glibc. Build and link against
# libunwind manually to get this functionality.
if (is_fuchsia) {
- deps = [
- "//buildtools/third_party/libunwind",
- ]
+ deps = [ "//buildtools/third_party/libunwind" ]
}
sources = [
@@ -54,9 +52,7 @@ source_set("libc++abi") {
sources += [ "trunk/src/cxa_demangle.cpp" ]
}
- # This file should really be included on linux as well, but that
- # would introduce an unwanted glibc 2.18 dependency.
- if (is_fuchsia || (is_posix && !is_mac && !is_ios && !is_linux)) {
+ if (is_fuchsia || (is_posix && !is_mac && !is_ios)) {
sources += [ "trunk/src/cxa_thread_atexit.cpp" ]
}
diff --git a/chromium/buildtools/win/clang-format.exe.sha1 b/chromium/buildtools/win/clang-format.exe.sha1
index d31c76fe75f..03c98aa593b 100644
--- a/chromium/buildtools/win/clang-format.exe.sha1
+++ b/chromium/buildtools/win/clang-format.exe.sha1
@@ -1 +1 @@
-b5f5d8d5f8a8fcd2edb5b6cae37c0dc3e129c945 \ No newline at end of file
+d4afd4eba27022f5f6d518133aebde57281677c9 \ No newline at end of file