diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
| commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
| tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/buildtools | |
| parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) | |
| download | qtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/buildtools')
| -rw-r--r-- | chromium/buildtools/DEPS | 6 | ||||
| -rw-r--r-- | chromium/buildtools/checkdeps/cpp_checker.py | 2 | ||||
| -rw-r--r-- | chromium/buildtools/linux64/gn.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/mac/gn.sha1 | 2 | ||||
| -rw-r--r-- | chromium/buildtools/win/gn.exe.sha1 | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS index c608a728c86..3b5b07e88d3 100644 --- a/chromium/buildtools/DEPS +++ b/chromium/buildtools/DEPS @@ -4,9 +4,9 @@ use_relative_paths = True vars = { "git_url": "https://chromium.googlesource.com", - "clang_format_rev": "a72164df8be7d1c68ae1ad6c3541e7819200327e", # r258123 - "libcxx_revision": "aad34a13af010898f54c1bb2069194cb083cea4b", - "libcxxabi_revision": "9a39e428d018b723d7d187181fd08908b1cb6bd0", + "clang_format_rev": "a72164df8be7d1c68ae1ad6c3541e7819200327e", # r258328 + "libcxx_revision": "b1ece9c037d879843b0b0f5a2802e1e9d443b75a", # r256621 + "libcxxabi_revision": "0edb61e2e581758fc4cd4cd09fc588b3fc91a653", # r256323 } deps = { diff --git a/chromium/buildtools/checkdeps/cpp_checker.py b/chromium/buildtools/checkdeps/cpp_checker.py index 16139915d7f..b8054dab860 100644 --- a/chromium/buildtools/checkdeps/cpp_checker.py +++ b/chromium/buildtools/checkdeps/cpp_checker.py @@ -69,7 +69,7 @@ class CppChecker(object): if self._resolve_dotdot and '../' in include_path: dependee_dir = os.path.dirname(dependee_path) - include_path = os.path.normpath(os.path.join(dependee_dir, include_path)) + include_path = os.path.join(dependee_dir, include_path) include_path = os.path.relpath(include_path, self._root_dir) rule = rules.RuleApplyingTo(include_path, dependee_path) diff --git a/chromium/buildtools/linux64/gn.sha1 b/chromium/buildtools/linux64/gn.sha1 index 976bb3438dc..c81a098259c 100644 --- a/chromium/buildtools/linux64/gn.sha1 +++ b/chromium/buildtools/linux64/gn.sha1 @@ -1 +1 @@ -8f22fff4b36a93c83d8583aa570d986101a811de +fbed2cdffa83d5df2adfd4f9f302a19cacd8c42c diff --git a/chromium/buildtools/mac/gn.sha1 b/chromium/buildtools/mac/gn.sha1 index c8f53229ff8..ffbdc82c798 100644 --- a/chromium/buildtools/mac/gn.sha1 +++ b/chromium/buildtools/mac/gn.sha1 @@ -1 +1 @@ -65619132f1ce369c312906d405e65c77fd389dd5 +c36a90035cc4b12b4531b587ba98de3a6eac018a diff --git a/chromium/buildtools/win/gn.exe.sha1 b/chromium/buildtools/win/gn.exe.sha1 index f0cf8a77a5d..9b22cf69e81 100644 --- a/chromium/buildtools/win/gn.exe.sha1 +++ b/chromium/buildtools/win/gn.exe.sha1 @@ -1 +1 @@ -926c5053e1b21d4bedcfdf15f3b4b34a9f372d28 +3f6d89fcde877a58862aad7664aa48bc41949f40 |