OSDN Git Service
Elliott Hughes [Mon, 24 Sep 2012 19:41:20 +0000 (12:41 -0700)]
am
7b0377ed: Merge "[MIPS] Removed the unused header"
* commit '
7b0377eda03abc9db79faa244e28aea1ac7b64da':
[MIPS] Removed the unused header
Elliott Hughes [Mon, 24 Sep 2012 19:24:00 +0000 (12:24 -0700)]
Merge "[MIPS] Removed the unused header"
Raghu Gandham [Mon, 24 Sep 2012 18:52:00 +0000 (11:52 -0700)]
[MIPS] Removed the unused header
Change-Id: I8756a862669d4e5f283945496983f11a59dea30c
Elliott Hughes [Mon, 24 Sep 2012 17:21:23 +0000 (10:21 -0700)]
am
3b6914bf: Merge "Fix dlsym and dladdr to use load_bias instead of base"
* commit '
3b6914bf04942f74e9dba43a75d5d5ae94161b95':
Fix dlsym and dladdr to use load_bias instead of base
Elliott Hughes [Mon, 24 Sep 2012 17:03:51 +0000 (10:03 -0700)]
Merge "Fix dlsym and dladdr to use load_bias instead of base"
Elliott Hughes [Mon, 24 Sep 2012 15:55:27 +0000 (08:55 -0700)]
am
0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit '
0c24effd01736e533fd082b2cf1de8926b0fe880':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
Elliott Hughes [Mon, 24 Sep 2012 15:43:45 +0000 (08:43 -0700)]
am
85049ead: Merge "Use hidden visibility for several internal-use-only functions."
* commit '
85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
Use hidden visibility for several internal-use-only functions.
Elliott Hughes [Mon, 24 Sep 2012 15:43:44 +0000 (08:43 -0700)]
am
882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
* commit '
882c6af953e5b3fd4b9f4fe74a68128ea16fba3b':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
Elliott Hughes [Mon, 24 Sep 2012 15:41:55 +0000 (08:41 -0700)]
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
Elliott Hughes [Sun, 23 Sep 2012 18:08:18 +0000 (11:08 -0700)]
Merge "Use hidden visibility for several internal-use-only functions."
Elliott Hughes [Sat, 22 Sep 2012 01:27:40 +0000 (18:27 -0700)]
Use hidden visibility for several internal-use-only functions.
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
Elliott Hughes [Sat, 22 Sep 2012 01:20:03 +0000 (18:20 -0700)]
Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
Raghu Gandham [Sat, 22 Sep 2012 00:13:25 +0000 (17:13 -0700)]
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
Raghu Gandham [Fri, 21 Sep 2012 19:21:02 +0000 (12:21 -0700)]
Fix dlsym and dladdr to use load_bias instead of base
Change-Id: If0f9aa944ccb1f90451aa6674428e34494331d2d
Elliott Hughes [Wed, 19 Sep 2012 00:13:15 +0000 (17:13 -0700)]
am
47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326"
* commit '
47dc4d431017e701239dd7d9a16333e0ad56a0ac':
Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326
Elliott Hughes [Tue, 18 Sep 2012 23:56:44 +0000 (16:56 -0700)]
Merge "Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326"
Dave Burke [Tue, 18 Sep 2012 03:37:38 +0000 (20:37 -0700)]
Make pthread_create more forgiving of invalid sched_policy.
Bug:
7005326
(cherry-pick of
e58303249b9e799a4fe84c5a2dfe71518441a6ec.)
Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
Elliott Hughes [Mon, 17 Sep 2012 22:50:18 +0000 (15:50 -0700)]
am
77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
* commit '
77ac158e90712a975f61b7559b8de558f644f48d':
Don't copy strerror(3) or strsignal(3) strings if we can share.
Elliott Hughes [Mon, 17 Sep 2012 22:36:26 +0000 (15:36 -0700)]
Merge "Don't copy strerror(3) or strsignal(3) strings if we can share."
Elliott Hughes [Mon, 17 Sep 2012 22:23:35 +0000 (15:23 -0700)]
Don't copy strerror(3) or strsignal(3) strings if we can share.
Change-Id: Ic405269f63b945c6fb347e7c4346cd6f104aff35
Elliott Hughes [Fri, 14 Sep 2012 23:18:00 +0000 (16:18 -0700)]
am
047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
* commit '
047a285d41e3fe0b1a8071ec19f436baf6f187b2':
Fix <sys/klog.h> to correspond to the kernel operations.
Elliott Hughes [Fri, 14 Sep 2012 23:14:48 +0000 (16:14 -0700)]
Merge "Fix <sys/klog.h> to correspond to the kernel operations."
Elliott Hughes [Fri, 14 Sep 2012 23:01:19 +0000 (16:01 -0700)]
am
51519521: Merge "Add tty defaults to bionic"
* commit '
51519521979c2daa417f6ca50c175e631c55dfb0':
Add tty defaults to bionic
Elliott Hughes [Fri, 14 Sep 2012 22:45:46 +0000 (15:45 -0700)]
Merge "Add tty defaults to bionic"
Elliott Hughes [Fri, 14 Sep 2012 22:42:30 +0000 (15:42 -0700)]
Fix <sys/klog.h> to correspond to the kernel operations.
This makes the constants correspond to those in the Linux kernel's
include/linux/syslog.h, but keeping our old badly-named constants for
source compatibility.
Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
Elliott Hughes [Fri, 14 Sep 2012 00:09:51 +0000 (17:09 -0700)]
am
4e9d953a: Merge "libc: add ftw / nftw functions"
* commit '
4e9d953a0e9334c0f3519f470b97973c31da5bb6':
libc: add ftw / nftw functions
Elliott Hughes [Fri, 14 Sep 2012 00:09:50 +0000 (17:09 -0700)]
am
e895e6de: Merge "Update libc/NOTICE and record the incantation."
* commit '
e895e6deaab620f874b3e9f196eb6b67f58dc278':
Update libc/NOTICE and record the incantation.
Elliott Hughes [Thu, 13 Sep 2012 23:55:39 +0000 (16:55 -0700)]
Merge "libc: add ftw / nftw functions"
Nick Kralevich [Wed, 12 Sep 2012 20:21:25 +0000 (13:21 -0700)]
libc: add ftw / nftw functions
Please see "man 3 ftw" for a description of the
ftw / nftw functions.
This code is taken directly from netbsd unmodified.
Change-Id: Ia4879ac57212b424adf5281b5e92858e216d0f14
Elliott Hughes [Thu, 13 Sep 2012 23:52:34 +0000 (16:52 -0700)]
Merge "Update libc/NOTICE and record the incantation."
Elliott Hughes [Thu, 13 Sep 2012 23:51:57 +0000 (16:51 -0700)]
Update libc/NOTICE and record the incantation.
Change-Id: I0673d6263de2c5a21cd549f18c0648d0fa4bb40f
Kenny Root [Thu, 13 Sep 2012 22:30:35 +0000 (15:30 -0700)]
am
f7e403d6: Merge changes I06ee0b67,I914d2205
* commit '
f7e403d66355faed93bb1472f6961acd380796d1':
Print out shared app gids correctly
Add tests for Android-specific stubs
Elliott Hughes [Thu, 13 Sep 2012 22:30:34 +0000 (15:30 -0700)]
am
fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
* commit '
fa36875df423af968d053c584c0de18a2448516b':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
Elliott Hughes [Thu, 13 Sep 2012 22:30:33 +0000 (15:30 -0700)]
am
b338ea30: Merge "Upgrade to tzdata2012f."
* commit '
b338ea30b299099a2b26a4e8a6b2ccd7bfac631a':
Upgrade to tzdata2012f.
Kenny Root [Thu, 13 Sep 2012 22:26:13 +0000 (15:26 -0700)]
Merge changes I06ee0b67,I914d2205
* changes:
Print out shared app gids correctly
Add tests for Android-specific stubs
Kenny Root [Thu, 13 Sep 2012 21:31:50 +0000 (14:31 -0700)]
Print out shared app gids correctly
For applications that share resources across users such as
forward-locked applications, print out their group name correctly.
Change-Id: I06ee0b67e4325cfa415ffd7a03e301700399a66d
Kenny Root [Thu, 13 Sep 2012 17:52:52 +0000 (10:52 -0700)]
Add tests for Android-specific stubs
Also fix problem with multi-user IDs that the home directory was
returned as "/data" instead of "/" unlike all the other uids.
Change-Id: I914d22052e5a86552989f8969b85aadbc748c65d
Elliott Hughes [Thu, 13 Sep 2012 22:19:36 +0000 (15:19 -0700)]
Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
Irina Tirdea [Sat, 8 Sep 2012 06:17:54 +0000 (09:17 +0300)]
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
Change-Id: I426109db25e907980d6cb3a7a695796e45783b78
Elliott Hughes [Thu, 13 Sep 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Upgrade to tzdata2012f."
Elliott Hughes [Thu, 13 Sep 2012 21:54:51 +0000 (14:54 -0700)]
Upgrade to tzdata2012f.
This release reflects the following change circulated on the tz
mailing list:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
20 this year. (Thanks to Steffen Thorsen.)
Change-Id: Ie21ea791ff5191264967aff685cbfa5c73f1fa5c
Elliott Hughes [Thu, 13 Sep 2012 18:09:49 +0000 (11:09 -0700)]
am
d2236e2c: Merge "Fix Mac build."
* commit '
d2236e2c0717818e150215b4eee7af58cd3540d8':
Fix Mac build.
Elliott Hughes [Thu, 13 Sep 2012 18:02:22 +0000 (11:02 -0700)]
Merge "Fix Mac build."
Elliott Hughes [Thu, 13 Sep 2012 18:01:46 +0000 (11:01 -0700)]
Fix Mac build.
Change-Id: Id625806fab0f2f7f90f9508c5fce649afe970414
Elliott Hughes [Thu, 13 Sep 2012 16:47:52 +0000 (09:47 -0700)]
am
4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
* commit '
4a9b7c694a8312160d3cd953a8227c23a1624868':
Add libdl into libc_malloc_debug_leak build
Elliott Hughes [Thu, 13 Sep 2012 16:47:51 +0000 (09:47 -0700)]
am
af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
* commit '
af4d630e4d87dca38cc2026b992bb50c49911db9':
Added new test for dlopen which is failing for MIPS.
Elliott Hughes [Thu, 13 Sep 2012 16:46:30 +0000 (09:46 -0700)]
Merge "Add libdl into libc_malloc_debug_leak build"
Elliott Hughes [Thu, 13 Sep 2012 16:42:49 +0000 (09:42 -0700)]
Merge "Added new test for dlopen which is failing for MIPS."
Pavel Chupin [Mon, 10 Sep 2012 15:35:25 +0000 (19:35 +0400)]
Add libdl into libc_malloc_debug_leak build
Otherwise libc_malloc_debug_leak.so is failed to load runtime in x86
case
Change-Id: I8207ce06d1ec17b233f4e4fcfdd2b161673b4fa8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
jeffhao [Thu, 13 Sep 2012 00:25:30 +0000 (17:25 -0700)]
Added new test for dlopen which is failing for MIPS.
Change-Id: I2240faefb387a11647f49b1a15699907a40f98c1
Elliott Hughes [Wed, 12 Sep 2012 22:59:29 +0000 (15:59 -0700)]
am
7593fa8e: Merge "Update the kernel headers to match external/kernel-headers."
* commit '
7593fa8eb7d8c3950a069e5edd244fb68872ec17':
Update the kernel headers to match external/kernel-headers.
Elliott Hughes [Wed, 12 Sep 2012 22:56:10 +0000 (15:56 -0700)]
Merge "Update the kernel headers to match external/kernel-headers."
Elliott Hughes [Wed, 12 Sep 2012 02:03:02 +0000 (19:03 -0700)]
Update the kernel headers to match external/kernel-headers.
Note that the Linux kernel handed over responsibility for most of the
socket constants to glibc some time ago. Someone had updated our
external/kernel-headers file but not regenerated the bionic headers,
so this change copies the missing stuff from the old bionic <linux/socket.h>
into <sys/socket.h>. This is what glibc does.
I've hacked a few of the other files to #include <sys/socket.h> for
backward compatibility, but even so this requires numerous other
changes to switch people over from direct inclusion of <linux/...> headers.
Change-Id: I0e4af64e631d3cef911a31d90f2f806e058278a0
Elliott Hughes [Wed, 12 Sep 2012 18:03:24 +0000 (11:03 -0700)]
am
666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
* commit '
666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
Elliott Hughes [Wed, 12 Sep 2012 17:51:48 +0000 (10:51 -0700)]
Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
Elliott Hughes [Wed, 12 Sep 2012 17:51:05 +0000 (10:51 -0700)]
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
Change-Id: Iba58077a1f057a968eb2283ebba259975925ff4c
Elliott Hughes [Tue, 11 Sep 2012 23:43:39 +0000 (16:43 -0700)]
am
cc8668f2: Merge "[MIPS] Check error status from pipe system call"
* commit '
cc8668f261ae5d0ed38961f357e33c026502ed0d':
[MIPS] Check error status from pipe system call
Elliott Hughes [Tue, 11 Sep 2012 23:38:43 +0000 (16:38 -0700)]
Merge "[MIPS] Check error status from pipe system call"
KwongYuan Wong [Tue, 27 Mar 2012 18:13:13 +0000 (11:13 -0700)]
[MIPS] Check error status from pipe system call
Change-Id: Iaaea0e826c2678aa7f6fad9d46b16302a4d3b876
Irina Tirdea [Sat, 8 Sep 2012 06:01:00 +0000 (09:01 +0300)]
Add tty defaults to bionic
Add ttydefaults.h bionic. Some userspace programs (e.g. perf) need the
definitions from this file. This header file is copied from NetBSD
(http://netbsd.org/) under the NetBSD Foundation's (TNF) license (“2 clause”
Berkeley-style license).
Change-Id: I9c862415b52b710f25adb1629a699627cd715775
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Elliott Hughes [Tue, 11 Sep 2012 18:15:53 +0000 (11:15 -0700)]
Add the libcutils localtime_tz and mktime_t extensions to bionic.
Bug:
7012465
Change-Id: Ib66f061e29199ba134545111dc79f9b50c8f4a21
Elliott Hughes [Mon, 10 Sep 2012 19:01:04 +0000 (12:01 -0700)]
am
59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit '
59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
Elliott Hughes [Mon, 10 Sep 2012 18:52:11 +0000 (11:52 -0700)]
Merge "Rename crtstart variables as crtbegin, to match reality."
Elliott Hughes [Mon, 10 Sep 2012 18:16:12 +0000 (11:16 -0700)]
Rename crtstart variables as crtbegin, to match reality.
No functional change, but it's confusing that the variable
names don't match the filenames.
Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
Ying Wang [Mon, 10 Sep 2012 17:05:14 +0000 (10:05 -0700)]
am
67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit '
67546bf209b2c5480aa4811b2bb3c42e7862af62':
Generate header dependency makefiles for the crt*.o
Ying Wang [Mon, 10 Sep 2012 16:48:45 +0000 (09:48 -0700)]
Merge "Generate header dependency makefiles for the crt*.o"
Elliott Hughes [Sat, 8 Sep 2012 01:38:41 +0000 (18:38 -0700)]
am
f1d57e16: Merge "Add more pthreads tests."
* commit '
f1d57e16686153b69a27c1eb9e339c77232c0edd':
Add more pthreads tests.
Elliott Hughes [Sat, 8 Sep 2012 01:30:17 +0000 (18:30 -0700)]
Merge "Add more pthreads tests."
Ying Wang [Sat, 8 Sep 2012 00:06:56 +0000 (17:06 -0700)]
Generate header dependency makefiles for the crt*.o
Bug:
7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
Elliott Hughes [Fri, 7 Sep 2012 23:47:54 +0000 (16:47 -0700)]
Add more pthreads tests.
Someone reported a bug if pthread_detach is called while a pthread_join is
already in progress, but I'm unable to reproduce it. Keep the tests I wrote,
though.
Change-Id: I3d71450bbbb5345f2cb213dc56310ec020d528cc
Elliott Hughes [Fri, 7 Sep 2012 18:07:13 +0000 (11:07 -0700)]
am
d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '
d10309c36b93176a473baeeddef6f3fba8bf0678':
Rename __dso_handle_so.c to __dso_handle_so.h
Elliott Hughes [Fri, 7 Sep 2012 18:07:10 +0000 (11:07 -0700)]
am
691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '
691ef3c80b4af278aa90d6e005ba42de1e52c140':
Add mlockall and munlockall for Google TV.
Elliott Hughes [Fri, 7 Sep 2012 17:59:20 +0000 (10:59 -0700)]
Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
Elliott Hughes [Fri, 7 Sep 2012 17:51:49 +0000 (10:51 -0700)]
Merge "Add mlockall and munlockall for Google TV."
Andrew Hsieh [Wed, 5 Sep 2012 11:00:43 +0000 (19:00 +0800)]
Rename __dso_handle_so.c to __dso_handle_so.h
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.
Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
Ian Rogers [Thu, 6 Sep 2012 18:45:54 +0000 (11:45 -0700)]
am
e8f81547: Merge "Fix build warning of initialization but no use."
* commit '
e8f815473ba463b875cea757bc0a52fc32f10748':
Fix build warning of initialization but no use.
Ian Rogers [Thu, 6 Sep 2012 18:41:52 +0000 (11:41 -0700)]
Merge "Fix build warning of initialization but no use."
Elliott Hughes [Thu, 6 Sep 2012 18:24:45 +0000 (11:24 -0700)]
Add mlockall and munlockall for Google TV.
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
Elliott Hughes [Thu, 6 Sep 2012 17:40:43 +0000 (10:40 -0700)]
am
6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '
6e3b0f2d2e89a8f3bbfc5d26dcdc13233c1111ba':
Don't corrupt the thread list in static executables.
Elliott Hughes [Thu, 6 Sep 2012 17:31:52 +0000 (10:31 -0700)]
Merge "Don't corrupt the thread list in static executables."
Ian Rogers [Thu, 6 Sep 2012 16:55:36 +0000 (09:55 -0700)]
Fix build warning of initialization but no use.
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.
Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
Elliott Hughes [Thu, 6 Sep 2012 00:47:37 +0000 (17:47 -0700)]
Don't corrupt the thread list in static executables.
Several previous changes conspired to make a mess of the thread list
in static binaries. This was most obvious when trying to call
pthread_key_delete(3) on the main thread.
Bug: http://code.google.com/p/android/issues/detail?id=36893
Change-Id: I2a2f553114d8fb40533c481252b410c10656da2e
Elliott Hughes [Wed, 5 Sep 2012 21:51:30 +0000 (14:51 -0700)]
am
ff4608ae: Merge "Add missing dependencies."
* commit '
ff4608ae0cb78caa05b83e109fc2633682958089':
Add missing dependencies.
Elliott Hughes [Wed, 5 Sep 2012 21:46:14 +0000 (14:46 -0700)]
Merge "Add missing dependencies."
Elliott Hughes [Wed, 5 Sep 2012 21:27:17 +0000 (14:27 -0700)]
Add missing dependencies.
Change-Id: I53c1cfb59ac7a89952a8d6b906b2b9e16a66624f
Elliott Hughes [Wed, 5 Sep 2012 17:29:23 +0000 (10:29 -0700)]
am
b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
* commit '
b2c5bd543dcbbc1b2cbf7afd8b124256ce2c128e':
ARM: warn about atexit() calls from legacy shared libraries
Elliott Hughes [Wed, 5 Sep 2012 17:18:43 +0000 (10:18 -0700)]
Merge "ARM: warn about atexit() calls from legacy shared libraries"
Elliott Hughes [Wed, 5 Sep 2012 16:57:15 +0000 (09:57 -0700)]
am
26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
* commit '
26f2e4a1639a959513c4ff5981b4eb52757e8012':
ARM: make CRT_LEGACY_WORKAROUND work as intended
Elliott Hughes [Wed, 5 Sep 2012 16:43:35 +0000 (09:43 -0700)]
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
Ian Rogers [Wed, 5 Sep 2012 14:48:14 +0000 (07:48 -0700)]
am
82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
* commit '
82978cae4eec238a9d631d2b61b8985daa02516e':
Avoid malloc lock while calling pthread_atfork.
Ian Rogers [Wed, 5 Sep 2012 14:41:31 +0000 (07:41 -0700)]
Merge "Avoid malloc lock while calling pthread_atfork."
Elliott Hughes [Wed, 5 Sep 2012 01:10:07 +0000 (18:10 -0700)]
am
be19a367: Merge "termios: add tcdrain"
* commit '
be19a3671709879ccc0156b94f7ef7540027dc37':
termios: add tcdrain
Elliott Hughes [Wed, 5 Sep 2012 00:52:39 +0000 (17:52 -0700)]
Merge "termios: add tcdrain"
Elliott Hughes [Tue, 4 Sep 2012 23:44:54 +0000 (16:44 -0700)]
am
5ff23471: Merge "Add getsid system call to bionic"
* commit '
5ff23471303a1b99ddc1e1751662aa45f34b5e21':
Add getsid system call to bionic
Elliott Hughes [Tue, 4 Sep 2012 23:36:26 +0000 (16:36 -0700)]
Merge "Add getsid system call to bionic"
Elliott Hughes [Tue, 4 Sep 2012 22:56:12 +0000 (15:56 -0700)]
am
e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
* commit '
e03ab936996a1a46d461cdad463d7f5bca10b051':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
Elliott Hughes [Tue, 4 Sep 2012 22:51:55 +0000 (15:51 -0700)]
Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
Elliott Hughes [Tue, 4 Sep 2012 22:42:23 +0000 (15:42 -0700)]
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
Without these, sometimes malloc(3) returns NULL without setting errno.
Change-Id: I4708c3f675bf2c878ddcaf012fde7848b255826b
Elliott Hughes [Tue, 4 Sep 2012 20:46:46 +0000 (13:46 -0700)]
am
1db615b4: Merge "bionic: Fix TINY_ANDROID build"
* commit '
1db615b4ae469c9f33dc1d88b24924ca8efc10ef':
bionic: Fix TINY_ANDROID build
Elliott Hughes [Tue, 4 Sep 2012 20:42:57 +0000 (13:42 -0700)]
Merge "bionic: Fix TINY_ANDROID build"