summaryrefslogtreecommitdiff
path: root/chromium/buildtools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/buildtools
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/buildtools')
-rw-r--r--chromium/buildtools/DEPS2
-rw-r--r--chromium/buildtools/android/doclava.tar.gz.sha11
-rw-r--r--chromium/buildtools/clang_format/README.chromium4
-rw-r--r--chromium/buildtools/linux64/clang-format.sha12
-rw-r--r--chromium/buildtools/linux64/gn.sha12
-rw-r--r--chromium/buildtools/mac/clang-format.sha12
-rw-r--r--chromium/buildtools/mac/gn.sha12
-rw-r--r--chromium/buildtools/third_party/libc++/BUILD.gn15
-rw-r--r--chromium/buildtools/third_party/libc++/libc++.gyp14
-rw-r--r--chromium/buildtools/win/clang-format.exe.sha12
-rw-r--r--chromium/buildtools/win/gn.exe.sha12
11 files changed, 27 insertions, 21 deletions
diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS
index 897121e4250..c608a728c86 100644
--- a/chromium/buildtools/DEPS
+++ b/chromium/buildtools/DEPS
@@ -4,7 +4,7 @@ use_relative_paths = True
vars = {
"git_url": "https://chromium.googlesource.com",
- "clang_format_rev": "81edd558fea5dd7855d67a1dc61db34ae8c1fd63", # r223685
+ "clang_format_rev": "a72164df8be7d1c68ae1ad6c3541e7819200327e", # r258123
"libcxx_revision": "aad34a13af010898f54c1bb2069194cb083cea4b",
"libcxxabi_revision": "9a39e428d018b723d7d187181fd08908b1cb6bd0",
}
diff --git a/chromium/buildtools/android/doclava.tar.gz.sha1 b/chromium/buildtools/android/doclava.tar.gz.sha1
new file mode 100644
index 00000000000..bb86b788760
--- /dev/null
+++ b/chromium/buildtools/android/doclava.tar.gz.sha1
@@ -0,0 +1 @@
+86b0c87e7e73c923f6d3373fe7547f1770dd4758
diff --git a/chromium/buildtools/clang_format/README.chromium b/chromium/buildtools/clang_format/README.chromium
index e4de0f0881c..c0ac56ed754 100644
--- a/chromium/buildtools/clang_format/README.chromium
+++ b/chromium/buildtools/clang_format/README.chromium
@@ -1,8 +1,8 @@
Name: clang-format
Short Name: clang-format
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/
-Version: 3.7
-Date: 15 Jul 2015
+Version: 3.9
+Date: 22 Jan 2016
Revision: See DEPS
License: University of Illinois/NCSA Open Source License
License File: NOT_SHIPPED
diff --git a/chromium/buildtools/linux64/clang-format.sha1 b/chromium/buildtools/linux64/clang-format.sha1
index 7ff80bb6667..7b33d28fbf8 100644
--- a/chromium/buildtools/linux64/clang-format.sha1
+++ b/chromium/buildtools/linux64/clang-format.sha1
@@ -1 +1 @@
-acc9e19e04ad4cf6be067366d2522348cd160ae1 \ No newline at end of file
+8b68e8093516183b8f38626740eeaff97f112f7e \ No newline at end of file
diff --git a/chromium/buildtools/linux64/gn.sha1 b/chromium/buildtools/linux64/gn.sha1
index 4efa917de5b..2c6bc660326 100644
--- a/chromium/buildtools/linux64/gn.sha1
+++ b/chromium/buildtools/linux64/gn.sha1
@@ -1 +1 @@
-e9c85131a14705216383066fd04855fc4368e36e
+67852eec0174c01587e2facaba5123a433e7c3fd
diff --git a/chromium/buildtools/mac/clang-format.sha1 b/chromium/buildtools/mac/clang-format.sha1
index 245b2e0a44d..81f13774d68 100644
--- a/chromium/buildtools/mac/clang-format.sha1
+++ b/chromium/buildtools/mac/clang-format.sha1
@@ -1 +1 @@
-e66adcd1631b8d80650e7b15106033b04c9c2212 \ No newline at end of file
+afe0942b94fe33619361efe1510ae081c3070dc1 \ No newline at end of file
diff --git a/chromium/buildtools/mac/gn.sha1 b/chromium/buildtools/mac/gn.sha1
index 9115bd5402f..d245822d21c 100644
--- a/chromium/buildtools/mac/gn.sha1
+++ b/chromium/buildtools/mac/gn.sha1
@@ -1 +1 @@
-98b456726c06399c8e5cf1f4934e83445fcb1369
+05ab6f893e714131b689d38e3544017eb8937ab6
diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn
index e6d7074be3b..48e18cb69fb 100644
--- a/chromium/buildtools/third_party/libc++/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++/BUILD.gn
@@ -2,16 +2,19 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# Used by libc++ and libc++abi.
config("config") {
+ defines = [ "LIBCXX_BUILDING_LIBCXXABI" ]
cflags = [
- "-isystem" + rebase_path("trunk/include", root_build_dir),
- "-isystem" + rebase_path("../libc++abi/trunk/include", root_build_dir),
"-fPIC",
"-fstrict-aliasing",
- "-nostdinc++",
"-pthread",
+ ]
+ cflags_cc = [
+ "-nostdinc++",
+ "-isystem" + rebase_path("trunk/include", root_build_dir),
+ "-isystem" + rebase_path("../libc++abi/trunk/include", root_build_dir),
"-std=c++11",
- "-DLIBCXX_BUILDING_LIBCXXABI",
]
}
@@ -58,7 +61,6 @@ shared_library("libc++") {
"//build/config/sanitizers:sanitizer_options_link_helper",
]
- defines = [ "LIBCXX_BUILDING_LIBCXXABI" ]
ldflags = [ "-nodefaultlibs" ]
# TODO(GYP): Remove "-pthread" from ldflags.
@@ -88,6 +90,9 @@ group("libcxx_proxy") {
public_configs = [ ":link_helper" ]
}
+# This config is only used by binaries and shared library targets.
+# //build/config/sanitizers:default_sanitizer_flags sets the include paths for
+# everything else.
config("link_helper") {
ldflags = [
"-stdlib=libc++",
diff --git a/chromium/buildtools/third_party/libc++/libc++.gyp b/chromium/buildtools/third_party/libc++/libc++.gyp
index 5a966fc9613..9bb3eeaf4b3 100644
--- a/chromium/buildtools/third_party/libc++/libc++.gyp
+++ b/chromium/buildtools/third_party/libc++/libc++.gyp
@@ -26,12 +26,10 @@
'all_dependent_settings': {
'target_conditions': [
['_type!="none"', {
- 'cflags': [
- '-isystem<(libcxx_root)/trunk/include',
- '-isystem<(libcxx_root)/../libc++abi/trunk/include',
- ],
'cflags_cc': [
'-nostdinc++',
+ '-isystem<(libcxx_root)/trunk/include',
+ '-isystem<(libcxx_root)/../libc++abi/trunk/include',
],
'ldflags': [
'-stdlib=libc++',
@@ -88,12 +86,14 @@
'trunk/src/valarray.cpp',
],
'cflags': [
- '-isystem<(libcxx_root)/trunk/include',
- '-isystem<(libcxx_root)/../libc++abi/trunk/include',
'-fPIC',
'-fstrict-aliasing',
- '-nostdinc++',
'-pthread',
+ ],
+ 'cflags_cc': [
+ '-nostdinc++',
+ '-isystem<(libcxx_root)/trunk/include',
+ '-isystem<(libcxx_root)/../libc++abi/trunk/include',
'-std=c++11',
],
'cflags_cc!': [
diff --git a/chromium/buildtools/win/clang-format.exe.sha1 b/chromium/buildtools/win/clang-format.exe.sha1
index 44cc587dc0b..2df19d5251f 100644
--- a/chromium/buildtools/win/clang-format.exe.sha1
+++ b/chromium/buildtools/win/clang-format.exe.sha1
@@ -1 +1 @@
-dd661c89fa003a9ebd57d59a7fea346c1fc87f79 \ No newline at end of file
+f80b6ab38d7c7e0903c25e968028c1eaa25bb874 \ No newline at end of file
diff --git a/chromium/buildtools/win/gn.exe.sha1 b/chromium/buildtools/win/gn.exe.sha1
index a24bb4e3f68..6cfc3de89ff 100644
--- a/chromium/buildtools/win/gn.exe.sha1
+++ b/chromium/buildtools/win/gn.exe.sha1
@@ -1 +1 @@
-14b37907020b299b5c6bfae1d7fed7d7a92e4fe6
+71399a86c63d6020155c00f38dc4e31b30ebfb3c