summaryrefslogtreecommitdiffstats
path: root/third_party
Commit message (Collapse)AuthorAgeFilesLines
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-3/+0
| | | | | | Bug: 5010576 Change-Id: I4eb21142f441f62f1e3b406e67e9739143596f49
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-0816-6/+1279
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-2992-2126/+3026
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-144-9/+301
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Moving libevent and modp_b64 to seperate makefiles.Kristian Monsen2011-03-318-0/+121
| | | | Change-Id: Ic7fee690ab1e98f025c90127b93cbea4150d0b78
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-0339-617/+1347
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-03148-19008/+3917
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Final fixing of ANDROID guardsKristian Monsen2010-10-2717-439/+2016
| | | | | | Verified that we now are in sync with chromium revision 61029 Change-Id: I49834ac6c0c422ab0d9a82caa02bdc63f456eadd
* Delete unused makefiles not in upstream chromiumKristian Monsen2010-10-265-728/+0
| | | | Change-Id: I4b89f1034e28cc1ff8cf0a64d8644b40ced9829f
* Syncing external/chromium with chromium release 61029, third_party/libeventKristian Monsen2010-10-269-773/+4
| | | | | | | | | | Libevent is now built as a separate library to remove some old hacks, it should now be possible to upstream the remaining local changes. Also removed some makefiles that are not in chromium Change-Id: I617823ca1a8516fe23d7ed26a608d4be80188cb2
* Removing third_party/icu as it doesn't seem to be usedKristian Monsen2010-10-262863-2803536/+0
| | | | Change-Id: I704883c39bc7cad9c24a8bc88984848ce06d40e0
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-19221-17174/+2693
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Build fixes for the simulator.Patrick Scott2010-10-011-1/+1
| | | | Change-Id: I4c01c5383d311c7f06e91b1ded529ef6db156b3f
* Add libjingle to third_partyBen Murdoch2010-09-13491-0/+107741
| | | | | | | | AutoFill requires this for it's XML parsing. Added from chromium src@52593 Change-Id: Ie0b1f600ed3a470f5d7eb4f939eba2f1d71e6fbe
* Collection of all the changs to external chromium.Ben Murdoch2010-08-115-2/+553
| | | | | | | | 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-0484-124343/+267913
| | | | Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
* Using the native zlib for external/chromium.Kristian Monsen2010-07-1943-17199/+0
| | | | | | One less thing to worry about, and decreases the size a bit. Change-Id: I53e4f962602972ac1d90889df56e95e0fcc0e3c7
* Get most of the chromium sources to compile by using a prefix header and somePatrick Scott2010-02-178-0/+1559
| | | | | | | fake headers. Added modp_b64 and some testing headers. Removed a lot of files from Android.mk since they refer to libraries we don't have. Still needs a lot of work...
* Initial source checkin.Patrick Scott2010-02-042961-0/+2751967
The source files were determined by building net_unittests in chromium's source tree. Some of the obvious libraries were left out (v8, gmock, gtest). The Android.mk file has all the sources (minus unittests and tools) that were used during net_unittests compilation. Nothing builds yet because of STL but that is the next task. The .cpp files will most likely not compile anyways because of the LOCAL_CPP_EXTENSION mod. I will have to break this into multiple projects to get around that limitation.