summaryrefslogtreecommitdiffstats
path: root/base
Commit message (Collapse)AuthorAgeFilesLines
* back port upstream patchFengwei Yin2012-08-151-2/+3
| | | | | | | | | | | | | | | | This patch is from Chromium project. It's used to handle potential issue in scoped_refptr. This is upstream patch porting and the original link is: http://codereview.chromium.org/9021020/ unittest change was not included. Change-Id: I14ce3df0653ff29713f38eceaf07e9b409cfaedc Author: Fengwei Yin <fengwei.yin@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 37500
* Merge "Fix lazy-instance template to preserve object alignment on MIPS."Jean-Baptiste Queru2012-08-101-1/+12
|\
| * Fix lazy-instance template to preserve object alignment on MIPS.Paul Lind2012-08-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | The alignment attribute of an object was discarded when allocating storage for the lazy-instance. Alignment is important for MIPS, where doubles (and objects containing them) must be aligned on 8-byte boundary. The alignment attributes are included via a macro that is only defined under GCC, so that this change does not affect other build enviromments. Change-Id: I99047cf610618de2e7e29e5de85835dc45d99231 Signed-off-by: Paul Lind <plind@mips.com>
* | Add MIPS architecture supportPaul Lind2012-08-073-0/+166
|/ | | | | | Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876 Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
* Forward-compatible fix for ucontext_tDavid 'Digit' Turner2012-07-111-2/+2
| | | | | | | | | | The Android C library <signal.h> will soon be modified to declare ucontext_t in <signal.h>. To avoid conflicts when this happens, only define the type when needed. See b/issue?id=2189142 Change-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb
* DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-061-0/+36
| | | | | | | | | | Bug: 6603427 Cherry picking from master to jb-dev. Sha: edec5f424996d4a532ba6fdb2203c06a02887606 This is to track some silent failures happening in mediaserver. Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
* Import content and address detector supportJohn Reck2012-02-231-2/+2
| | | | Change-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9
* Fix for bug 5152544, remove warning from chromium portKristian Monsen2011-11-221-2/+8
| | | | | | | This is a cherry-pick of http://codereview.chromium.org/8354008/ No more warnings after this is merged. Change-Id: I788d28545e7961d0145a3f1273ce4302f8c432ad
* Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-215-11/+36
| | | | | | Some are upstream, others guarded with #ifdef ANDROID are not Change-Id: I8615feafc0ad088d237794acdace655d9f842c12
* Remove temporary debug loggingSteve Block2011-10-193-74/+0
| | | | | | | | This is a cherry-pick of https://android-git.corp.google.com/g/#/c/141900, which went into ics-mr0 only. Bug: 5454995 Change-Id: I970b59f6da4890d0b89566ffa1909c33707f9506
* More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| | | | | | | Add a check for multiple overlapping calls to StartWithOptions() Bug: 5244039 Change-Id: Ic89b94309126cc53320c3e7973c0eea0d88fd9c4
* Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| | | | | Bug: 5244039 Change-Id: I385642faf33ec9f3875cfd035c9500e7342ca17d
* Use notable values when clearing Thread::startup_data_ to help with debuggingSteve Block2011-09-301-0/+10
| | | | | Bug: 5244039 Change-Id: I2f91ceb69c140b70b550eda83aa6bbafc95631f2
* Part of fix for bug 5152544 Reduce the number of warningKristian Monsen2011-08-111-0/+10
| | | | Change-Id: I960864ea02e41fda180544a5d077f63c3c3119b9
* Merge Chromium at r12.0.742.93: Fix misc conflictsKristian Monsen2011-07-083-22/+5
| | | | | | | | | | | | | | http://src.chromium.org/viewvc/chrome/branches/742/src/base/debug/stack_trace_posix.cc?r1=79524&r2=81601&pathrev=88489 Added const in stack_trace_posix.cc http://codereview.chromium.org/6688056/ Updated DCHECK's in base, conflict in shared_memory_posix.cc http://codereview.chromium.org/6673068 New NACL header file in base/third_party/nspr/, conflict in prcpucfg.h Change-Id: I656054ca3aae8dca9678c2455c7b7b90715514ff
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-08349-10626/+6816
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Compile fix in message_loop.ccKristian Monsen2011-06-301-1/+1
| | | | | | | Upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/base/message_loop.cc?view=diff&pathrev=77261&r1=75476&r2=75477 Change-Id: Id87aaacd579ce3f73a14673321d26b37ee9b739d
* Merge Chromium at r11.0.696.0: Fix conflict in message_loop.ccKristian Monsen2011-06-291-5/+1
| | | | | | | | Added a function close to a local edit: http://src.chromium.org/viewvc/chrome/trunk/src/base/message_loop.cc?view=diff&pathrev=77261&r1=76073&r2=76074 http://src.chromium.org/viewvc/chrome/trunk/src/base/message_loop.cc?view=diff&pathrev=77261&r1=75476&r2=75477 Change-Id: I5a4ff62bb14b762e495cdf44ff0eefef9470cc5d
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29112-1728/+2772
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.ccKristian Monsen2011-06-141-14/+4
| | | | | | | Changes around local edit: http://src.chromium.org/viewvc/chrome/trunk/src/base/shared_memory_posix.cc?view=diff&r1=70974&r2=70975 Change-Id: I3c06547ed799c4b1048163cb98b0c0da05ad7cf6
* Merge Chromium at r11.0.672.0: Fix conflicts in logging.ccKristian Monsen2011-06-141-7/+3
| | | | | | | This CL was close to our local edit: http://src.chromium.org/viewvc/chrome/trunk/src/base/logging.cc?view=diff&pathrev=74924&r1=70976&r2=70977 Change-Id: I9b689dfe5cd85dc069923207aaf222a33109120b
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14155-3077/+8039
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* File not used, matching upstream to avoid conflicts.Kristian Monsen2011-06-141-22/+2
| | | | Change-Id: Iee92f225644e96852796596a25f571e05ebf28a7
* Add ScopedOpenSSL::release like scoped_refptr::releaseBrian Carlstrom2011-06-051-0/+6
| | | | Change-Id: I1d6c19f12f2b78f95ee1e54015c8e1a02f12c7f1
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25188-2150/+1875
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Removing local changes that strip out vlogKristian Monsen2011-05-231-9/+2
| | | | | | Slightly less #ifdef's Change-Id: Icd55c23e1e8ffb4b7f3b8740617b96f257160aab
* Merge Chromium at 10.0.621.0: Fix conflict in prcpucfg.hKristian Monsen2011-05-161-5/+1
| | | | | | | Upstream change where we have a local change. http://codereview.chromium.org/5479001/ Change-Id: I8fdd7adb4d992e0a03273d76ffde407ef9efb939
* Merge Chromium at 10.0.621.0: Fix conflict in message_loop.ccKristian Monsen2011-05-161-5/+1
| | | | | | | Upstream change at the same place as our local change. http://codereview.chromium.org/5435001 Change-Id: I46034835f1fc3b2933f3097c9b1bccaf5f7d6eb1
* Merge Chromium at 10.0.621.0: Fix conflict in logging.ccKristian Monsen2011-05-161-3/+2
| | | | | | | Changes at the same place as our local edit: http://codereview.chromium.org/5804004 Change-Id: I176dbe5bff0f652088f74f5a92ffe22d789b74f9
* Merge Chromium at 10.0.621.0: Fix conflict in hash_tables.hKristian Monsen2011-05-161-4/+0
| | | | | | | Spelling error correction at the same place as our local change http://codereview.chromium.org/5185001 Change-Id: I3b4e81dd4bf76ea0c6d0a399df549fcccf084035
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16140-3001/+2393
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* am 2934fcc7: Build dmg_fp as a separate libraryKristian Monsen2011-03-314-0/+44
|\ | | | | | | | | * commit '2934fcc75abc95fb5f67aee8184422166b9247da': Build dmg_fp as a separate library
| * Build dmg_fp as a separate libraryKristian Monsen2011-03-314-0/+44
| | | | | | | | Change-Id: I218892553ea555ead616528b820185194b3e3a0e
* | am dc2edc99: Removing nss dependecyKristian Monsen2011-03-316-1682/+0
|\ \ | |/ | | | | | | * commit 'dc2edc99e0ad7b585c413f4bc37da3cad1dda985': Removing nss dependecy
| * Removing nss dependecyKristian Monsen2011-03-316-1682/+0
| | | | | | | | Change-Id: Ica9ab9cbaf008afbb8201d1a2c346db24c31ed35
* | am f62b871a: Remove more projects from external/chromium that are not neededBart Sears2011-03-314-3981/+0
|\ \ | |/ | | | | | | * commit 'f62b871af464c8cdbc34299a9d7893f54fb7d113': Remove more projects from external/chromium that are not needed
| * Remove more projects from external/chromium that are not neededBart Sears2011-03-304-3981/+0
| | | | | | | | | | Bug: 4194380 Change-Id: I2b4be1ce797244c7c89d494707910b8187d5ad02
* | am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-3039-7542/+0
|\ \ | |/ | | | | | | * commit '47c0a16e8b9f5c6cfb515871409697aa20236ed5': Removing projects that are not needed to compile
| * Removing projects that are not needed to compileKristian Monsen2011-03-3039-7542/+0
| | | | | | | | | | Bug: 4194380 Change-Id: Idf9ea7c893786dc3cb7ad869563679e1c8c56aed
* | Merge Chromium at 9.0.597.106Steve Block2011-02-185-0/+21
| | | | | | | | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
* | am 68a6b857: Merge Chromium at 9.0.597.55: Fix process_util_posix.ccBen Murdoch2011-01-111-0/+5
|\ \ | |/ | | | | | | * commit '68a6b85744e19ade18f176a89653f1924e64f39a': Merge Chromium at 9.0.597.55: Fix process_util_posix.cc
| * Merge Chromium at 9.0.597.55: Fix process_util_posix.ccBen Murdoch2011-01-111-0/+5
| | | | | | | | | | | | | | | | | | There is no ucontext.h on Android but the type is not actually used for us, so typedef to void. See http://src.chromium.org/viewvc/chrome?view=rev&revision=67012 Change-Id: I1e789abaac25d513c3d4c1acb5321fa1d43f2eef
* | am 78494470: Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-111-5/+1
|\ \ | |/ | | | | | | * commit '78494470aa829a52d6709093dd00e7704053e806': Merge chromium at 9.0.597.55: Fix conflicts.
| * Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-111-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tab_contents.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=67659 pref_value_store.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=66755 base_paths_linux.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67202 personal_data_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67344 autofill_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67599 Change-Id: I7016d521fa2f2f13d0c50e5609b72ceaae64d8f0
* | am 201ade2f: Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1176-296/+1081
|\ \ | |/ | | | | | | * commit '201ade2fbba22bfb27ae029f4d23fca6ded109a0': Merge chromium at 9.0.597.55: Initial merge by git.
| * Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1176-296/+1081
| | | | | | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* | Revert "Guard startup_data_ to ensure it is set."Patrick Scott2011-01-052-30/+0
|/ | | | | | | | This reverts commit 6549a5990c7b8672bd9d216ffb55d8a7a5999cc2. It was an incorrect fix for the underlying problem. The real fix was in webkit where we were creating the thread. The problem was that StartWithOptions was being called by two different threads at the same time.
* Guard startup_data_ to ensure it is set.Patrick Scott2010-12-162-0/+30
| | | | | | | | | | On SMP systems, instructions can be reordered such that the new thread executes before startup_data_ has been written. Use a mutex to ensure instruction order and to force startup_data_ to be flushed. This fixes spurious crashes when starting the browser. Bug: 3291265 Change-Id: Idb29cda6e03d01d42781284d5a9545486ee92bc8
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-0367-344/+1538
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Merge ANDROID edits into new debugging fileBen Murdoch2010-11-191-3/+18
| | | | | | | | | We previously had edits to base/debug_util_posix.cc, this file has been moved to base/debug/debugger_posix.cc. Merge our edits accross. http://src.chromium.org/viewvc/chrome?view=rev&revision=63859 Change-Id: I25ad39619858115cad943a02f4aa7f4ecbb9b38e
generated by cgit v1.1 at 2024-12-22 09:38:00 +0000