| 206cf38d173e938a20bbee623af570db81e7ff8d |
|
01-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Fix misc conflicts
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
/external/chromium/base/shared_memory_posix.cc
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/base/shared_memory_posix.cc
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/base/shared_memory_posix.cc
|
| a873c8ac8e3c7252f191b1774a9137a91b8ae80d |
|
01-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc
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
/external/chromium/base/shared_memory_posix.cc
|
| 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/base/shared_memory_posix.cc
|
| 3f50c38dc070f4bb515c1b64450dae14f316474e |
|
24-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
/external/chromium/base/shared_memory_posix.cc
|
| 513209b27ff55e2841eac0e4120199c23acce758 |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
/external/chromium/base/shared_memory_posix.cc
|
| a63d6587a9fe4317d9cd57ab8b7ef9e5951d05fc |
|
02-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Fix shared_memory_posix.cc
Android is not actually POSIX and doesn't have lockf(). For now,
just commenting out these calls. File locking shouldn't be needed
as we don't have multiple processes, unlike Chrome.
Change-Id: Ia9705562be54a79681176873b2e9910ece6e79d9
/external/chromium/base/shared_memory_posix.cc
|
| 3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/base/shared_memory_posix.cc
|
| c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/base/shared_memory_posix.cc
|
| c7f5f8508d98d5952d42ed7648c2a8f30a4da156 |
|
04-Feb-2010 |
Patrick Scott <phanna@android.com> |
Initial source checkin.
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.
/external/chromium/base/shared_memory_posix.cc
|