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
Christopher Ferris
c9734d24d9
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
Change-Id: I8f20963b0b8d323489dc083e4063779e0d1d7447
2014-10-09 11:10:23 -07:00
Dan Albert
df511204f5
am 653f30b1: am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '653f30b15a9bff8567a4f2fa1ff444dba00281ab':
Use snprintf(3) instead of sprintf(3).
2014-10-09 12:44:54 +00:00
Dan Albert
c18259333b
am 8b3b4fa0: am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '8b3b4fa0ae9e08e64f508e4745ff46c492d84497':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 12:44:43 +00:00
Ying Wang
94dfa99c15
am 75fd0e76: am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '75fd0e76f81c22d9af689695dc17ef98ad44e384':
Build dlext_testzip as custom module.
2014-10-09 12:44:42 +00:00
Dmitriy Ivanov
118de39fd6
am c4210cea: am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'c4210cea45e160162d571992c483faa16d1e0bb6':
Fix mma build: 'cd bionic && mma' case
2014-10-09 12:44:34 +00:00
Elliott Hughes
913d393b10
am 301c452e: am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '301c452e5562f9ea286286a1cdb44e73ea390e5c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-09 12:44:33 +00:00
Elliott Hughes
fad6661ad9
am 46b99841: am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit '46b998415561aadb8b47c61b7892e85a81b13de5':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-09 12:44:32 +00:00
Dan Albert
b9122b73bf
am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '8a7f8387b3b95de2ee0c42e34a226a1fcc066896':
Use snprintf(3) instead of sprintf(3).
2014-10-09 00:40:24 +00:00
Dan Albert
653f30b15a
am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '8a7f8387b3b95de2ee0c42e34a226a1fcc066896':
Use snprintf(3) instead of sprintf(3).
2014-10-09 00:39:27 +00:00
Dan Albert
8a7f8387b3
Merge "Use snprintf(3) instead of sprintf(3)."
2014-10-09 00:32:11 +00:00
Dan Albert
a2220ffb74
am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '72d72d91262fabe6bc169618ef3acb0721441cf0':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 00:13:06 +00:00
Ying Wang
196f4eee9f
am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '0c0e728bd8cdeb0e73fd9c491d05993dfc77b622':
Build dlext_testzip as custom module.
2014-10-09 00:13:05 +00:00
Dan Albert
8b3b4fa0ae
am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '72d72d91262fabe6bc169618ef3acb0721441cf0':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 00:12:30 +00:00
Ying Wang
75fd0e76f8
am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '0c0e728bd8cdeb0e73fd9c491d05993dfc77b622':
Build dlext_testzip as custom module.
2014-10-09 00:12:29 +00:00
Dan Albert
ca75f9cdeb
Use snprintf(3) instead of sprintf(3).
...
This change should probably be made upstream as well, but they have a
note about not using it because it isn't available on all systems.
Change-Id: I6d8404c031bd2f486532ced55d94bbb4a4cd2e71
2014-10-08 17:10:26 -07:00
Dan Albert
72d72d9126
Merge "Replace uses of sprintf(3) with snprintf(3)."
2014-10-08 23:44:48 +00:00
Ying Wang
0c0e728bd8
Merge "Build dlext_testzip as custom module."
2014-10-08 23:43:50 +00:00
Ying Wang
667853d477
Build dlext_testzip as custom module.
...
Use $(BUILD_SYSTEM)/base_rules to build it as custom module, so that
it's exposed to utilities like mm/mmma etc.
Bug: 17887283
Change-Id: Idd7b62d08e4d56331a3ff15da6aa46eae8c41898
2014-10-08 16:38:58 -07:00
Dan Albert
cfd8c45725
Replace uses of sprintf(3) with snprintf(3).
...
At -00, the compiler warns about sprintf(3), and it is promoted to an
error by -Werror.
Change-Id: Ibb380d27d7eb09dda8ac785be2478d656b379190
2014-10-08 16:12:27 -07:00
Dmitriy Ivanov
86c20f6a52
am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'ac3c94d031c16a0299471a593cdc6248494e539d':
Fix mma build: 'cd bionic && mma' case
2014-10-08 22:49:22 +00:00
Elliott Hughes
9a96ca3ec4
am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '0511534dcbb00f26b2fd6209b1b60a3263bf042c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-08 22:49:21 +00:00
Elliott Hughes
294d7d1215
am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit 'bfeef2d3a903f161531ce5e45b2dd7d280e7f154':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-08 22:49:20 +00:00
Dmitriy Ivanov
c4210cea45
am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'ac3c94d031c16a0299471a593cdc6248494e539d':
Fix mma build: 'cd bionic && mma' case
2014-10-08 22:49:08 +00:00
Elliott Hughes
301c452e55
am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '0511534dcbb00f26b2fd6209b1b60a3263bf042c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-08 22:49:07 +00:00
Elliott Hughes
46b9984155
am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit 'bfeef2d3a903f161531ce5e45b2dd7d280e7f154':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-08 22:49:06 +00:00
Dmitriy Ivanov
ac3c94d031
Merge "Fix mma build: 'cd bionic && mma' case"
2014-10-08 22:39:21 +00:00
Dmitriy Ivanov
51166d3aa2
Fix mma build: 'cd bionic && mma' case
...
Bug: 17887283
Change-Id: If2015f2361348eac8c53aed3f8715077b79ce2f5
2014-10-08 15:36:56 -07:00
Elliott Hughes
0511534dcb
Merge "Don't silently return EINVAL for a NULL sem_t*."
2014-10-08 22:21:13 +00:00
Elliott Hughes
bfeef2d3a9
Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
2014-10-08 22:17:19 +00:00