summaryrefslogtreecommitdiff
path: root/chromium/tools
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> Fix autogenerated env.bat files for Windows builds.Michael BrĂ¼ning2014-07-172-5/+3
| | | | | | | | Removes the addition of 'component=share_library' from GYP_DEFINES. This caused a build error due to missing files. Change-Id: I062e7f8ba7d28f298df4bee289e24b495875dc5f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* <tools/grit> GRIT: Allow grd files outside of chromium source dir.Zeno Albisser2014-06-041-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: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* <tools/gyp> Allow letting qmake do the link stepJocelyn Turcotte2014-06-041-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. Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Change-Id: I753888776679e449d7a64b6bf5b47e7a60dfa827 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* <tools/gyp> Add support for libc++ to xcode_emulation.pyZeno Albisser2014-06-041-0/+3
| | | | | | Change-Id: Ifbe063950d14d8388e3c8c1d6cebdfae5cbdb8ae Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* <tools/gyp> Fix build with toplevel-dirPierre Rossi2014-06-041-1/+6
| | | | | Change-Id: I3fcbf166978cf20f7a07d7e6bda135864054e9c1 Reviewed-by: Zeno Albisser <zeno.albisser@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