summaryrefslogtreecommitdiff
path: root/chromium/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fix build of documentationKai Koehne2017-07-041-19/+1
| | | | | | | | | | | | Remove logic to include the scanning in the .gn files. This depends on Android code currently stripped from qtwebengine.git. Also, we don't need it, since we scan as part of the documentation generation. Task-number: QTBUG-61693 Change-Id: I868fd35ce48169da625f16b903134a4e62be5a31 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge branch 'upstream-master' into 58-basedAllan Sandfeld Jensen2017-05-051-1/+8
|\ | | | | | | Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a
| * BASELINE: Update Chromium to 58.0.3029.98Allan Sandfeld Jensen2017-05-051-1/+8
| | | | | | | | | | Change-Id: Ib913750d687f29e036959c62a0cabf2412a8faa7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | gn-build gn with exactly the python it was bootstrapped withJoerg Bornemann2017-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | If bootstrap.py is called with a python2 executable but the first python executable in PATH is a python3, then the gn-build of gn will fail. Fix this by passing the exact python location to gn it was bootstrapped with. Change-Id: I17d9cd3614c3a3bee5d54a08a27b9e08d29ada4d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Windows: Fix file path too long problems in grit.pyMichael Brüning2017-05-031-1/+3
| | | | | | | | | | | | | | | | | | There have been issues with too long file paths in grit.py when doing shadow builds on Windows. Change-Id: Ia0ff5e214bcd079853db32432b58da046698e73e Task-number: QTBUG-59544 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove various test and telemetry dependenciesAlexandru Croitor2017-05-031-0/+7
| | | | | | | | | | | | | | This allows removing the catapult dependency Change-Id: Ia2bf777b07e9f88e28d6637bf3aab5d6a97ca7e6 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add support for creating pri link informationMichal Klocek2017-05-0317-5/+612
| | | | | | | | | | | | | | | | | | | | | | | | Add variable create_pri_file for binary tagets, which generates <target_name>.pri. Instead of calling linker add timestamp file, this will be a dependency for qmake linking. Also adds sources for Qt Creator indexes. Change-Id: I91a41e5cab0a2db99a32e4d799d9664467b9cb18 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Prevent a python IOError on Windows due to MAX_PATHAllan Sandfeld Jensen2017-05-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running python down into the WebKit directory structure and referring a file relatively to the build directory can easily spill over the 260 char limit on Windows. Resolve the absolute path using join and normpath to work around the issue. The script for aggregating the generated bindings suffered from the same error on Windows as the other generator python scripts. The bison script for compiling grammars suffers from the MAX_PATH IOError issue on Windows. This occurs when doing a shadow build that results in large relative paths in the generated GYP actions. The scripts for generating and aggregating the v8 bindings all suffer from an IOError on Windows when doing a shadow build that results in very large relative paths being used in the generated GYP actions. Combined from patches by Jocelyn Turcotte and Peter Varga. Change-Id: I86f57fc94e8ff633e2499a08b8cafa7df9b39210 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Fix gn bootstrap with --no-rebuildAllan Sandfeld Jensen2017-05-031-2/+3
| | | | | | | | | | | | | | Do not try to install if we were building into the final path. Change-Id: I1a32a9b3431b0adec8269f5c43a57e7349025da2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix GN bootstrapAllan Sandfeld Jensen2017-05-031-12/+8
| | | | | | | | | | | | | | Repair a few instances of brain-damage. Change-Id: I6ede5389f0eb40e9ef369c51689052aa74ce559f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add option to pass ninja binary path to gn bootstrapMichal Klocek2017-05-031-0/+6
| | | | | | | | | | | | | | | | This option allows to pass ninja binary path which is bootstrped during qtqwebenigne build. Change-Id: I756da6032f3e00be39691d0153a0d34e28a2f658 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add shadow option to gn bootstrapMichal Klocek2017-05-031-1/+8
| | | | | | | | | | | | | | | | This option allows doing shadow build of gn bootstrap in qt build dir. Change-Id: I0036260527c87d1259cbb88b062032c1964285dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adapt licenses.py for qdoc needsKai Koehne2017-05-031-0/+3
| | | | | | | | | | | | | | | | | | | | * Mask '*/' in licenses.py output, so qdoc is not confused * Add 'name-sanitized', 'license-type' placeholders (cherry picked from commit f8554350d7477b4d3a8ca4596be054ba95c7f091) Change-Id: I080ed7894464a39a4c33ef15e6a1b56b421e2c9f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | <tools/grit> GRIT: Allow grd files outside of chromium source dir.Zeno Albisser2017-05-021-0/+6
|/ | | | | | | | | | | | | | | | | When replacing substrings with values from a dictionary, the replacements should not be truncated to the length of src_root_dir. If the basename does not exist as a key in the resource_ids file, then fall back to an absolute path. The precedence is like: file in chromium > file basename > absolute file name. THIS SHOULD BE UPSTREAMABLE. Change-Id: I7d1da8c04515807000742aac4a6fa4db7616fd13 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update Chromium to 58.0.3029.54Allan Sandfeld Jensen2017-04-11148-720/+4543
| | | | | Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* BASELINE: Update Chromium to 57.0.2987.144Allan Sandfeld Jensen2017-04-11188-1955/+6761
| | | | | Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* BASELINE: Update Chromium to 56.0.2924.122Allan Sandfeld Jensen2017-03-20170-13536/+10013
| | | | | Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 55.0.2883.105Allan Sandfeld Jensen2017-01-05390-9525/+14618
| | | | | | | And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add all gn, gni, typemap, mojom filesMichal Klocek2016-11-1620-0/+672
| | | | | | | | These file are required to gn be able to parse source tree. Change-Id: I9cb4a0b3897c1e99dd6e39832a8c55764fb6e1c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* BASELINE: Update Chromium to 53.0.2785.80Allan Sandfeld Jensen2016-08-252-3/+6
| | | | | | | Also adds 3rdparty libraries under pdfium. Change-Id: I29afb23f1642fa55765d056697d5d145afa22bb2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 53.0.2785.41Allan Sandfeld Jensen2016-08-04179-2110/+5979
| | | | | | | Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1Allan Sandfeld Jensen2016-08-04211-9186/+7539
| | | | | Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* BASELINE: Update Chromium to 51.0.2704.47Allan Sandfeld Jensen2016-05-121-165/+34
| | | | | | | And adds in a few missing files. Change-Id: Id0d85c81f5efc1b1c8cf9cb3241da26bf7245026 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* BASELINE: Update Chromium to 51.0.2704.41Allan Sandfeld Jensen2016-05-091327-1123/+202699
| | | | | | | Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add sanitizer dependencies.Alexandru Croitor2016-04-187-0/+261
| | | | | | | | Add libc++ and libc++abi third_party libraries for ASan builds. Add blacklist rules for all sanitizers. Change-Id: I65beaa1c5bb21e971f8333f0dcad8aed316c9f3c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* BASELINE: Update Chromium to 49.0.2623.23Allan Sandfeld Jensen2016-01-25247-4969/+3727
| | | | | | | Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update Chromium to 47.0.2526.14Allan Sandfeld Jensen2015-10-1477-2585/+3591
| | | | | | | Also adding in sources needed for spellchecking. Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* BASELINE: Update chromium to 45.0.2454.40Allan Sandfeld Jensen2015-08-1458-2602/+1704
| | | | | Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-291-0/+65
| | | | | | | | Also adds missing compile_test tool, and removed two unused third_party modules. Change-Id: Ie6135c2a57c8c9519aa093eb0a259a605b26a111 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* BASELINE: Update to chromium 44.0.2403.80Allan Sandfeld Jensen2015-07-0768-8401/+0
| | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* BASELINE: Update chromium to 44.0.2403.47Allan Sandfeld Jensen2015-06-18263-3966/+17288
| | | | | Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2014-12-09210-2588/+8346
| | | | | Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to beta version 37.0.2062.68Jocelyn Turcotte2014-08-12666-124675/+10634
| | | | | Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-044-58/+23
| | | | | | | | | | | | | | | This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-20284-9756/+20965
| | | | | | | | | This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Allow letting qmake do the link stepJocelyn Turcotte2014-03-071-0/+43
| | | | | | | | | | This adds a let_qmake_do_the_linking target variable to tell ninja not to link but rather dump the linking information from gyp in a file that we'll parse with qmake. Change-Id: Icfaadae7ce4e9895f76b5fe06e05124e9b980e8b Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-131094-317896/+7462
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-29115-4935/+2973
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Initial import.Zeno Albisser2013-08-152086-0/+511614
View Lorry Controller Status