summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Add MIPS architecture supportPaul Lind2012-08-071-0/+5
| | | | | | Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876 Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
* Import content and address detector supportJohn Reck2012-02-231-0/+10
| | | | Change-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9
* Merge Chromium at 12.0.742.130: Fix conflictsKristian Monsen2011-07-261-11/+0
| | | | | | | | | | 5080607 Update external/chromium to latest revision Did not sync the build directory last merge, so git think it is added, this gives a conflict in the file with local changes. Change-Id: I3e2fcf5f78a02046a092ef8a3e31bd8ba0429b52
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-2644-0/+5568
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-0840-5294/+0
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Define USE_SYSTEM_SQLITE and remove local changeKristian Monsen2011-07-081-0/+1
| | | | | | | Android is already using the system sqlite, but the define was not available at the time of the initial port. Change-Id: I41b740a82e39cdbdea2639478a606febd9e105eb
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-2910-61/+276
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Do not define USE_X11 for AndroidKristian Monsen2011-06-291-0/+4
| | | | | | | | | | USE_X11 should never be defined for Android, this will fix a problem in the upcoming merge. There should be no behavior change as we don't have any headers from X11. Change-Id: I6417087961ab376d1bc73ef356388b4d7166c120
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14109-7493/+298
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25104-110/+7543
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-1611-445/+80
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge Chromium at 9.0.597.83: Trivial merge by GitBen Murdoch2011-01-251-21/+0
| | | | Change-Id: Ib650207b150b49b604e6fd25a20d7ed7a6de9afc
* Merge Chromium at 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-161-0/+1
| | | | | | /branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-117-22/+86
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Merge Chromium at r66597: Fix conflicts.Ben Murdoch2010-12-031-5/+2
| | | | | | | | | | | | | | | | build_config.h http://src.chromium.org/viewvc/chrome?view=rev&revision=65920 pref_value_store.cc|h http://src.chromium.org/viewvc/chrome?view=rev&revision=66426 personal_data_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=65830 x509_certificate_openssl.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=66413 Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-035-25/+52
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Fix conflicts.Ben Murdoch2010-11-191-7/+6
| | | | | | | | | | | | | | | | | | | | | | | build/build_config.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=63506 chrome/browser/autofill/personal_data_manager.h chrome/browser/autofill/personal_data_manager.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65100 chrome/common/extensions/docs/permission_warnings.html: Git got confused :/ net/base/host_resolver_impl.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64369 base/logging.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65062 base/message_loop.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64975 Change-Id: Ied0356824b26ad7e6fea14fdc56cebb73b8b2f2a
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-187-12/+137
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-0310-46/+188
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Removing unused Makefiles that does not exist upstream from build/Kristian Monsen2010-10-2722-567/+0
| | | | Change-Id: I647b011d88564087e2c9b99c72e4f4238c793f64
* Syncing external/chromium with chromium release 61029, buildKristian Monsen2010-10-2517-3469/+268
| | | | | | | | | | | Just adding and removing unused files. There are some local changse after this, in build_config.h where we have added some options for ANDROID, will try to upstream, and the Makefiles are generated and contain the directory they were generated in. Change-Id: Ie42941dae731fe3cf9732cc46a9a557e00098c08
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-1911-60/+205
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Collection of all the changs to external chromium.Ben Murdoch2010-08-111-1/+1
| | | | | | | | Time is running out, I guess we have to submit this and remember to upstream. Rebased to chromium r53293 Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
* Merge Chromium src@r53293Ben Murdoch2010-08-0469-3/+8522
| | | | Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
* Using the native zlib for external/chromium.Kristian Monsen2010-07-191-0/+6
| | | | | | One less thing to worry about, and decreases the size a bit. Change-Id: I53e4f962602972ac1d90889df56e95e0fcc0e3c7
* Add a few more files needed to build.Patrick Scott2010-02-041-0/+113
generated by cgit v1.1 at 2024-12-22 08:01:18 +0000