generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,883 Commits 77 Branches 202 Tags
Commit Graph

11883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Ferris
8f055f7f54 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 14:35:22 +00:00
Christopher Ferris
1713191651 am b767f632: am 62a665a6: Merge "Add back symbols to fix Greed for Glory franchise." 
* commit 'b767f632f34c8efa73d9489fd0d4509bcbb8db71':
  Add back symbols to fix Greed for Glory franchise.
 2014-10-10 06:43:22 +00:00
Christopher Ferris
b767f632f3 am 62a665a6: Merge "Add back symbols to fix Greed for Glory franchise." 
* commit '62a665a605df64a6ea5ac680bb564ad7a5f03711':
  Add back symbols to fix Greed for Glory franchise.
 2014-10-10 06:38:35 +00:00
Christopher Ferris
472c21b437 am 62a665a6: Merge "Add back symbols to fix Greed for Glory franchise." 
* commit '62a665a605df64a6ea5ac680bb564ad7a5f03711':
  Add back symbols to fix Greed for Glory franchise.
 2014-10-10 06:38:26 +00:00
Christopher Ferris
62a665a605 Merge "Add back symbols to fix Greed for Glory franchise." 2014-10-10 05:25:26 +00:00
Christopher Ferris
78ba823033 Add back symbols to fix Greed for Glory franchise. 
Bug: 17813018

(cherry picked from commit c891e24073830e07ba7373dee554ff2c70e1d313)

Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153
 2014-10-09 22:23:50 -07:00
Elliott Hughes
2e7b1ba806 am 404f2a0a: am 8dd3b65f: Merge "Sync libm with upstream." 
* commit '404f2a0a224d73a8d9c5d4f1d37d9d1a3ae5ea8d':
  Sync libm with upstream.
 2014-10-10 02:14:00 +00:00
Elliott Hughes
dc4dc99268 am 8dd3b65f: Merge "Sync libm with upstream." 
* commit '8dd3b65f2dd63df1baa83285f607cf110f21c27c':
  Sync libm with upstream.
 2014-10-10 01:59:21 +00:00
Elliott Hughes
404f2a0a22 am 8dd3b65f: Merge "Sync libm with upstream." 
* commit '8dd3b65f2dd63df1baa83285f607cf110f21c27c':
  Sync libm with upstream.
 2014-10-10 01:57:56 +00:00
Christopher Ferris
c891e24073 Add back symbols to fix Greed for Glory franchise. 
Bug: 17813018
Change-Id: Id939426ee5303117b9601e7915fcfec5024fc621
 2014-10-09 18:31:01 -07:00
Elliott Hughes
8dd3b65f2d Merge "Sync libm with upstream." 2014-10-10 01:26:18 +00:00
Elliott Hughes
488268b134 Sync libm with upstream. 
Change-Id: I3b4e2c9c6ce6c5934f270a51ce5eb9154c5805d5
 2014-10-09 16:20:37 -07:00
Elliott Hughes
d8907d9043 am b20a5c8d: am e9c216fc: Merge "Fix pthread_attr_getstack under valgrind." 
* commit 'b20a5c8df897b319351a596a97c095d79d9cacca':
  Fix pthread_attr_getstack under valgrind.
 2014-10-09 22:15:04 +00:00
Elliott Hughes
b20a5c8df8 am e9c216fc: Merge "Fix pthread_attr_getstack under valgrind." 
* commit 'e9c216fca56e84b0d0a96f7d5e3c99d3276ef071':
  Fix pthread_attr_getstack under valgrind.
 2014-10-09 22:11:00 +00:00
Elliott Hughes
a852bb56e8 am e9c216fc: Merge "Fix pthread_attr_getstack under valgrind." 
* commit 'e9c216fca56e84b0d0a96f7d5e3c99d3276ef071':
  Fix pthread_attr_getstack under valgrind.
 2014-10-09 22:10:37 +00:00
Christopher Ferris
7f4618cbc8 am c9734d24: Re-add dlmalloc for 32 bit. 
* commit 'c9734d24d92f4737f5ab3808c77d816a1b084582':
  Re-add dlmalloc for 32 bit.
 2014-10-09 22:02:00 +00:00
Elliott Hughes
e9c216fca5 Merge "Fix pthread_attr_getstack under valgrind." 2014-10-09 21:17:41 +00:00
Elliott Hughes
9afb2f2106 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
Change-Id: Iff85ceb6d52e8716251fab4e45d95a27184c5529
 2014-10-09 14:01:47 -07:00
Christopher Ferris
42e0817b45 resolved conflicts for merge of c9734d24 to lmp-dev-plus-aosp 
Change-Id: I2ced64fed071f126725a8cdbd12d7c1f45ab7947
 2014-10-09 12:12:49 -07:00
Christopher Ferris
fcbd52ceb0 am 9d192aa0: am d0944d9e: Merge "Re-add dlmalloc for 32 bit." 
* commit '9d192aa08e6dad091f5fa0aeb6cb0541eaca96a5':
  Re-add dlmalloc for 32 bit.
 2014-10-09 19:05:10 +00:00
Christopher Ferris
95296d4129 am d0944d9e: Merge "Re-add dlmalloc for 32 bit." 
* commit 'd0944d9ed38be0d74c3d8876f0f36b9ddc0ce38c':
  Re-add dlmalloc for 32 bit.
 2014-10-09 18:59:43 +00:00
Christopher Ferris
9d192aa08e am d0944d9e: Merge "Re-add dlmalloc for 32 bit." 
* commit 'd0944d9ed38be0d74c3d8876f0f36b9ddc0ce38c':
  Re-add dlmalloc for 32 bit.
 2014-10-09 18:59:39 +00:00
Christopher Ferris
d0944d9ed3 Merge "Re-add dlmalloc for 32 bit." 2014-10-09 18:50:32 +00:00
Christopher Ferris
f183f95946 Re-add dlmalloc for 32 bit. 
It turns out that appportable has a version that calls dlmalloc directly.
Re-add the dlmalloc symbol for 32 bit only as a compatibility shim that
calls malloc.

Bug: 17881362

(cherry pick commit from c9734d24d92f4737f5ab3808c77d816a1b084582)

Change-Id: Iee9a777f66a1edb407d7563a60792b767ac4f83a
 2014-10-09 11:47:01 -07:00