Dan Albert
8d87796d19
am 71cbcdcf: Merge "We don\'t actually need all of libc++ here."
...
* commit '71cbcdcf947835076241b9dd72099f28997eb290':
We don't actually need all of libc++ here.
2014-10-15 20:10:06 +00:00
Dan Albert
71cbcdcf94
Merge "We don't actually need all of libc++ here."
2014-10-15 19:59:09 +00:00
Dan Albert
a7c2e0bad6
We don't actually need all of libc++ here.
...
All we're actually interested in is the unwinder. Since that's now a
separate library, just use that.
Change-Id: If86071a0d850da961336a58147b70369ace7bd12
2014-10-14 14:19:34 -07:00
Elliott Hughes
1201b719ed
am a7995f31: am 97df16ba: Merge "Add clock_settime and clock_nanosleep."
...
* commit 'a7995f31e2e584e4df8cbdb543e7e0c6535506cf':
Add clock_settime and clock_nanosleep.
2014-10-14 03:58:49 +00:00
Elliott Hughes
2476691632
am 97df16ba: Merge "Add clock_settime and clock_nanosleep."
...
* commit '97df16ba5c2911e06d1211781a5724706abd227b':
Add clock_settime and clock_nanosleep.
2014-10-14 03:26:03 +00:00
Elliott Hughes
a7995f31e2
am 97df16ba: Merge "Add clock_settime and clock_nanosleep."
...
* commit '97df16ba5c2911e06d1211781a5724706abd227b':
Add clock_settime and clock_nanosleep.
2014-10-14 03:25:51 +00:00
Elliott Hughes
97df16ba5c
Merge "Add clock_settime and clock_nanosleep."
2014-10-14 03:07:43 +00:00
Haruki Hasegawa
1816025684
Add clock_settime and clock_nanosleep.
...
Add the missing prototypes, fix the existing prototypes to use clockid_t
rather than int, fix clock_nanosleep's failure behavior, and add simple
tests.
Bug: 17644443
Bug: https://code.google.com/p/android/issues/detail?id=77372
Change-Id: I03fba369939403918abcabae9551a7123953d780
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
2014-10-13 17:04:10 -07:00
Dmitriy Ivanov
261fb20671
am a9223e74: am c2297050: Merge "Add glibc alias for NT_PRFPREG"
...
* commit 'a9223e74d0ca22587e6a5535c9c2b1c8c044a0bb':
Add glibc alias for NT_PRFPREG
2014-10-13 22:25:15 +00:00
Christopher Ferris
526c1221e1
am f7c3db67: am 083769a3: Merge "Return total footprint, not high water mark."
...
* commit 'f7c3db67a172a103ce9fa85733738c20770e551a':
Return total footprint, not high water mark.
2014-10-13 22:25:13 +00:00
Dan Albert
cc530083c0
am a6ef2e28: am 94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
...
* commit 'a6ef2e2819bb930b212a492b4f2245d10fd4fc8f':
Use LOCAL_CXX_STL to select libc++_static.
2014-10-13 22:25:13 +00:00
Dmitriy Ivanov
a9223e74d0
am c2297050: Merge "Add glibc alias for NT_PRFPREG"
...
* commit 'c229705051c8b6a06ad81c221ca74ef9aa743e13':
Add glibc alias for NT_PRFPREG
2014-10-13 22:19:46 +00:00
Christopher Ferris
f7c3db67a1
am 083769a3: Merge "Return total footprint, not high water mark."
...
* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
Return total footprint, not high water mark.
2014-10-13 22:15:58 +00:00
Dan Albert
a6ef2e2819
am 94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
...
* commit '94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
Use LOCAL_CXX_STL to select libc++_static.
2014-10-13 22:15:54 +00:00
Dmitriy Ivanov
951e582c68
am c2297050: Merge "Add glibc alias for NT_PRFPREG"
...
* commit 'c229705051c8b6a06ad81c221ca74ef9aa743e13':
Add glibc alias for NT_PRFPREG
2014-10-13 22:15:39 +00:00
Christopher Ferris
737b6581c2
am 083769a3: Merge "Return total footprint, not high water mark."
...
* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
Return total footprint, not high water mark.
2014-10-13 22:10:03 +00:00
Dan Albert
c01a38622a
am 94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
...
* commit '94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
Use LOCAL_CXX_STL to select libc++_static.
2014-10-13 22:10:00 +00:00
Dmitriy Ivanov
c229705051
Merge "Add glibc alias for NT_PRFPREG"
2014-10-13 22:08:52 +00:00
Dmitriy Ivanov
a6bee4df4c
Add glibc alias for NT_PRFPREG
...
Also fix comment style for DF_1_ constants
Change-Id: I7c3ed1d834f0a2b85ee8cc8016c79020955084f8
2014-10-13 15:03:27 -07:00
Christopher Ferris
083769a3df
Merge "Return total footprint, not high water mark."
2014-10-13 19:48:35 +00:00
Christopher Ferris
3928d3e2d6
am 93e474ef: am 59a02860: Merge "Return total footprint, not high water mark." into lmp-mr1-dev
...
* commit '93e474ef5485c0628c358351d3cc6e4938294beb':
Return total footprint, not high water mark.
2014-10-13 19:46:50 +00:00
Christopher Ferris
fee09e556f
Return total footprint, not high water mark.
...
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug: 17265653
(cherry pick from commit f4ada9c9ce31c7e56146a4cb703747385bc043a5)
Change-Id: I2fba10285859dccfe8331063c9be14cc169f2d91
2014-10-13 12:45:35 -07:00
Christopher Ferris
93e474ef54
am 59a02860: Merge "Return total footprint, not high water mark." into lmp-mr1-dev
...
* commit '59a02860a455af68d501ee847889620343dcfb0d':
Return total footprint, not high water mark.
2014-10-13 19:44:19 +00:00
Christopher Ferris
59a02860a4
Merge "Return total footprint, not high water mark." into lmp-mr1-dev
2014-10-13 19:36:56 +00:00
Christopher Ferris
f4ada9c9ce
Return total footprint, not high water mark.
...
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug: 17265653
Change-Id: Id0293a1b50c9b0be8795405049f537a51ab0e8b7
2014-10-13 12:29:30 -07:00
Dan Albert
94571f9ade
Merge "Use LOCAL_CXX_STL to select libc++_static."
2014-10-13 19:09:00 +00:00
Dan Albert
90a29db0f4
Use LOCAL_CXX_STL to select libc++_static.
...
Directly adding the library to LOCAL_STATIC_LIBRARIES thwarts a few
build system checks.
Change-Id: Ib23c43badfa85de21c691f79ccdcc2cbe2a89b33
2014-10-13 11:20:29 -07:00
Dan Albert
3563a46aed
am 7bdab15e: am 4c086247: Merge "Fix some formatting so GitHub displays it nicely."
...
* commit '7bdab15e7b3d67dd97b94097c8974b4b85bed7e9':
Fix some formatting so GitHub displays it nicely.
2014-10-11 01:04:07 +00:00
Dan Albert
7bdab15e7b
am 4c086247: Merge "Fix some formatting so GitHub displays it nicely."
...
* commit '4c0862474e63b09c901d11de47a318ce73a0c686':
Fix some formatting so GitHub displays it nicely.
2014-10-11 00:58:12 +00:00
Dan Albert
04e0d0ee7e
am 4c086247: Merge "Fix some formatting so GitHub displays it nicely."
...
* commit '4c0862474e63b09c901d11de47a318ce73a0c686':
Fix some formatting so GitHub displays it nicely.
2014-10-11 00:57:31 +00:00
Dan Albert
4c0862474e
Merge "Fix some formatting so GitHub displays it nicely."
2014-10-11 00:48:33 +00:00
Dan Albert
472cce5c98
Fix some formatting so GitHub displays it nicely.
...
Change-Id: Id6ce9a61bebd98544c85e5780147715c73d0e78b
2014-10-10 17:14:37 -07:00
Dan Albert
6d5c6e7fa0
am 3a05a8b1: am 8c3901b2: Merge "Improve documentation for testing and coverage."
...
* commit '3a05a8b150a1bae663831a5cee54b5c0c1130303':
Improve documentation for testing and coverage.
2014-10-10 23:07:31 +00:00
Dan Albert
3a05a8b150
am 8c3901b2: Merge "Improve documentation for testing and coverage."
...
* commit '8c3901b2999e6821b8ee984193352ba45b003492':
Improve documentation for testing and coverage.
2014-10-10 23:02:57 +00:00
Christopher Ferris
2bb7009436
am 50f76f37: am e0fafb01: am c891e240: Add back symbols to fix Greed for Glory franchise.
...
* commit '50f76f375b67756f0c31afcc83ed9a98e1810b24':
Add back symbols to fix Greed for Glory franchise.
2014-10-10 22:08:04 +00:00
Elliott Hughes
48a9101986
am 9a6d0fa1: am 2f25cf37: Fix pthread_attr_getstack under valgrind.
...
* commit '9a6d0fa1c18bf66611c46942edf2a3e8a6acda8a':
Fix pthread_attr_getstack under valgrind.
2014-10-10 22:07:56 +00:00
Elliott Hughes
0433575035
am 227faaed: am 2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
...
* commit '227faaedd575561b2a598de6d9d614420b0894b7':
Catch up on upstream's round/roundf/roundl.
2014-10-10 22:07:54 +00:00
Christopher Ferris
50f76f375b
am e0fafb01: am c891e240: Add back symbols to fix Greed for Glory franchise.
...
* commit 'e0fafb019e33374fae3fa5dc3473e921566b5991':
Add back symbols to fix Greed for Glory franchise.
2014-10-10 21:02:28 +00:00
Christopher Ferris
e0fafb019e
am c891e240: Add back symbols to fix Greed for Glory franchise.
...
* commit 'c891e24073830e07ba7373dee554ff2c70e1d313':
Add back symbols to fix Greed for Glory franchise.
2014-10-10 20:47:00 +00:00
Dan Albert
64d5450947
am 8c3901b2: Merge "Improve documentation for testing and coverage."
...
* commit '8c3901b2999e6821b8ee984193352ba45b003492':
Improve documentation for testing and coverage.
2014-10-10 19:05:03 +00:00
Dan Albert
8c3901b299
Merge "Improve documentation for testing and coverage."
2014-10-10 18:59:03 +00:00
Dan Albert
efee1ce46a
Improve documentation for testing and coverage.
...
Also rename HACKING.txt to README.md so it will display on the GitHub
mirror.
Change-Id: I70157a4ad262700212bf9afd87253d195c7013a9
2014-10-10 11:45:19 -07:00
Elliott Hughes
9a6d0fa1c1
am 2f25cf37: Fix pthread_attr_getstack under valgrind.
...
* commit '2f25cf373ca7c875956a7c06483b30d381296817':
Fix pthread_attr_getstack under valgrind.
2014-10-10 18:44:54 +00:00
Christopher Ferris
c952c8cf84
am 2df4673e: resolved conflicts for merge of 7f4618cb to lmp-mr1-dev-plus-aosp
...
* commit '2df4673edd837e06fb8ae8ec7dd3fdb7a779cfc8':
Re-add dlmalloc for 32 bit.
2014-10-10 18:42:29 +00:00
Elliott Hughes
2f25cf373c
Fix pthread_attr_getstack under valgrind.
...
valgrind seems to mess with the stack enough that the kernel will
report "[stack:pid]" rather than "[stack]" in /proc/self/maps, so
switch to the task-specific file instead to force "[stack]". (There
are two conditions in the kernel code that decides which form to
output.)
Bug: 17897476
(cherry picked from commit 9afb2f2106a5d659854c175c574c1c31e0e205a2)
Change-Id: I92c331ef6fb5868af49e75bc595710d290a95f5b
2014-10-10 10:57:48 -07:00
Elliott Hughes
227faaedd5
am 2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
...
* commit '2698f9ef8412011295702cd6df4b66e01cf6c220':
Catch up on upstream's round/roundf/roundl.
2014-10-10 17:41:11 +00:00
Elliott Hughes
b503f51080
am 2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
...
* commit '2698f9ef8412011295702cd6df4b66e01cf6c220':
Catch up on upstream's round/roundf/roundl.
2014-10-10 17:39:00 +00:00
Elliott Hughes
2698f9ef84
Merge "Catch up on upstream's round/roundf/roundl."
2014-10-10 17:29:52 +00:00
Elliott Hughes
14538ca75e
Catch up on upstream's round/roundf/roundl.
...
Not sure how we missed these, but better late than never...
Change-Id: Ib08d1bb6e340a1907cbeb1cbe220e33f70642bdc
2014-10-10 10:21:43 -07:00
Christopher Ferris
2df4673edd
resolved conflicts for merge of 7f4618cb to lmp-mr1-dev-plus-aosp
...
Change-Id: I9b65f8287a4f155f26ae7e217e9553a3aaf22240
2014-10-10 10:05:38 -07:00