diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/buildtools | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/buildtools')
| -rw-r--r-- | chromium/buildtools/checkdeps/java_checker.py | 2 | ||||
| -rw-r--r-- | chromium/buildtools/clang_format/README.chromium | 4 | ||||
| -rw-r--r-- | chromium/buildtools/linux64/clang-format.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/linux64/gn.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/mac/clang-format.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/mac/gn.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/win/clang-format.exe.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/win/gn.exe.sha1 | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/chromium/buildtools/checkdeps/java_checker.py b/chromium/buildtools/checkdeps/java_checker.py index f5fbc1faff0..7edfb3f6f58 100644 --- a/chromium/buildtools/checkdeps/java_checker.py +++ b/chromium/buildtools/checkdeps/java_checker.py @@ -48,7 +48,7 @@ class JavaChecker(object): # TODO(husky): We need some way of determining the "real" path to # a generated file -- i.e., where it would be in source control if # it weren't generated. - if d in ('out', 'xcodebuild'): + if d.startswith('out') or d in ('xcodebuild',): return True # Skip third-party directories. if d in ('third_party', 'ThirdParty'): diff --git a/chromium/buildtools/clang_format/README.chromium b/chromium/buildtools/clang_format/README.chromium index b37c32657d2..e4de0f0881c 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.6 -Date: 09 Dec 2014 +Version: 3.7 +Date: 15 Jul 2015 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 62900c4c125..7ff80bb6667 100644 --- a/chromium/buildtools/linux64/clang-format.sha1 +++ b/chromium/buildtools/linux64/clang-format.sha1 @@ -1 +1 @@ -7219213d084db0ea8eaed8f4291814f4f46fad3a
\ No newline at end of file +acc9e19e04ad4cf6be067366d2522348cd160ae1
\ No newline at end of file diff --git a/chromium/buildtools/linux64/gn.sha1 b/chromium/buildtools/linux64/gn.sha1 index 17391b75b40..b4d042f7bd2 100644 --- a/chromium/buildtools/linux64/gn.sha1 +++ b/chromium/buildtools/linux64/gn.sha1 @@ -1 +1 @@ -207d41540222bfd1522f33ee3633139a3a4b4256 +99c8c860293ffaa02f0e501415c17ebbbf826240 diff --git a/chromium/buildtools/mac/clang-format.sha1 b/chromium/buildtools/mac/clang-format.sha1 index a14b5750080..245b2e0a44d 100644 --- a/chromium/buildtools/mac/clang-format.sha1 +++ b/chromium/buildtools/mac/clang-format.sha1 @@ -1 +1 @@ -1b3d3f4c5f7007ded806151cc624273d0c5a25ce
\ No newline at end of file +e66adcd1631b8d80650e7b15106033b04c9c2212
\ No newline at end of file diff --git a/chromium/buildtools/mac/gn.sha1 b/chromium/buildtools/mac/gn.sha1 index a2db3851019..f692cfb06d3 100644 --- a/chromium/buildtools/mac/gn.sha1 +++ b/chromium/buildtools/mac/gn.sha1 @@ -1 +1 @@ -de17e80d36d1a942aa78066afdc82eb5c58e8145 +cba1c4a8dbff8569d4be21136d4442c3322580d5 diff --git a/chromium/buildtools/win/clang-format.exe.sha1 b/chromium/buildtools/win/clang-format.exe.sha1 index 78f4d86af79..44cc587dc0b 100644 --- a/chromium/buildtools/win/clang-format.exe.sha1 +++ b/chromium/buildtools/win/clang-format.exe.sha1 @@ -1 +1 @@ -2d5e931765ee1c7c4465fd6d77c8b7606c487b3f
\ No newline at end of file +dd661c89fa003a9ebd57d59a7fea346c1fc87f79
\ No newline at end of file diff --git a/chromium/buildtools/win/gn.exe.sha1 b/chromium/buildtools/win/gn.exe.sha1 index f776260d2a3..3baaa76f1ce 100644 --- a/chromium/buildtools/win/gn.exe.sha1 +++ b/chromium/buildtools/win/gn.exe.sha1 @@ -1 +1 @@ -dd5927d06de75d7ca218420ea518f35e318c7519 +bcd10a05f7f1ea9f203f9e310e32e46612327369 |