Elliott Hughes
6a163a1bf1
am c9829a2b
: am 155a70b9
: am de9db8f7
: am fa36875d
: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit 'c9829a2b6fb70f2eb0fc6a21f48546c66d9724c7':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-14 10:28:04 -07:00
Elliott Hughes
8631744c49
am 953dbbda
: am c7fda6a9
: am d4623e56
: am b338ea30
: Merge "Upgrade to tzdata2012f."
...
* commit '953dbbda49c9a46e5b1b8d78a643c44eb1426d0e':
Upgrade to tzdata2012f.
2012-09-14 10:28:03 -07:00
Elliott Hughes
c9829a2b6f
am 155a70b9
: am de9db8f7
: am fa36875d
: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit '155a70b93fcccf8e5dec108fb730e25471eaecba':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:36:05 -07:00
Elliott Hughes
953dbbda49
am c7fda6a9
: am d4623e56
: am b338ea30
: Merge "Upgrade to tzdata2012f."
...
* commit 'c7fda6a96daeb6d089f3d8f4426b6fc211017289':
Upgrade to tzdata2012f.
2012-09-13 15:36:03 -07:00
Elliott Hughes
155a70b93f
am de9db8f7
: am fa36875d
: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit 'de9db8f7efb10cdab1c81f1d3164f3b55e5f08e9':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:33:57 -07:00
Elliott Hughes
c7fda6a96d
am d4623e56
: am b338ea30
: Merge "Upgrade to tzdata2012f."
...
* commit 'd4623e56fb61b38e2c436f214a1282252908b93b':
Upgrade to tzdata2012f.
2012-09-13 15:33:56 -07:00
Elliott Hughes
de9db8f7ef
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).
2012-09-13 15:30:34 -07:00
Elliott Hughes
d4623e56fb
am b338ea30
: Merge "Upgrade to tzdata2012f."
...
* commit 'b338ea30b299099a2b26a4e8a6b2ccd7bfac631a':
Upgrade to tzdata2012f.
2012-09-13 15:30:33 -07:00
Elliott Hughes
fa36875df4
Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
2012-09-13 15:19:37 -07:00
Irina Tirdea
b5f053b5a7
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
...
Change-Id: I426109db25e907980d6cb3a7a695796e45783b78
2012-09-13 15:18:21 -07:00
Elliott Hughes
b338ea30b2
Merge "Upgrade to tzdata2012f."
2012-09-13 15:15:09 -07:00
Elliott Hughes
88b61cb691
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
2012-09-13 14:54:51 -07:00
Elliott Hughes
4aebbf63c3
am 3d019017
: am bec648ee
: am 8db4b91b
: am d2236e2c
: Merge "Fix Mac build."
...
* commit '3d0190177469a8a25895117fc41625cd22e2fb28':
Fix Mac build.
2012-09-13 14:12:31 -07:00
Elliott Hughes
ce061964f7
am c005a55c
: am 478f8ff3
: am b2550dd4
: am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit 'c005a55c74105c4eed8e2b0ba68ce0bfd67ccffe':
Add libdl into libc_malloc_debug_leak build
2012-09-13 14:12:02 -07:00
Elliott Hughes
9f7d6840da
am 00f927f1
: am 29861b5d
: am 58d15966
: am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '00f927f137b553caa19fdc62497c012a1cb95f88':
Added new test for dlopen which is failing for MIPS.
2012-09-13 14:12:01 -07:00
Elliott Hughes
3d01901774
am bec648ee
: am 8db4b91b
: am d2236e2c
: Merge "Fix Mac build."
...
* commit 'bec648ee9f47c4120e5a4f82c7f0e6d225cb107f':
Fix Mac build.
2012-09-13 11:14:23 -07:00
Elliott Hughes
bec648ee9f
am 8db4b91b
: am d2236e2c
: Merge "Fix Mac build."
...
* commit '8db4b91bd2a069b2afb377f7e5190f625c3002cf':
Fix Mac build.
2012-09-13 11:11:54 -07:00
Elliott Hughes
8db4b91bd2
am d2236e2c
: Merge "Fix Mac build."
...
* commit 'd2236e2c0717818e150215b4eee7af58cd3540d8':
Fix Mac build.
2012-09-13 11:09:49 -07:00
Elliott Hughes
d2236e2c07
Merge "Fix Mac build."
2012-09-13 11:02:22 -07:00
Elliott Hughes
38bfa21695
Fix Mac build.
...
Change-Id: Id625806fab0f2f7f90f9508c5fce649afe970414
2012-09-13 11:01:46 -07:00
Elliott Hughes
c005a55c74
am 478f8ff3
: am b2550dd4
: am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit '478f8ff3f0bd0b805702eb1f90bd03eef6d19e89':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:54:31 -07:00
Elliott Hughes
00f927f137
am 29861b5d
: am 58d15966
: am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '29861b5d8edf9506acd2289fb5b993b9a7997a59':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:54:30 -07:00
Elliott Hughes
478f8ff3f0
am b2550dd4
: am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit 'b2550dd4c85845974bf61d3e4071b2b957fbcf09':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:52:38 -07:00
Elliott Hughes
29861b5d8e
am 58d15966
: am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '58d15966c8f95998f82a90a5b24e23d56ba6254f':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:52:37 -07:00
Elliott Hughes
b2550dd4c8
am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit '4a9b7c694a8312160d3cd953a8227c23a1624868':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:47:52 -07:00
Elliott Hughes
58d15966c8
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.
2012-09-13 09:47:51 -07:00
Elliott Hughes
4a9b7c694a
Merge "Add libdl into libc_malloc_debug_leak build"
2012-09-13 09:46:31 -07:00
Elliott Hughes
af4d630e4d
Merge "Added new test for dlopen which is failing for MIPS."
2012-09-13 09:42:50 -07:00
Elliott Hughes
9a78257905
am cf57515f
: am f801cf55
: resolved conflicts for merge of 47bda0c2
to jb-mr1-dev
...
* commit 'cf57515f7070539d560640247df6941a360fcff9':
Update the kernel headers to match external/kernel-headers.
2012-09-13 03:21:42 -07:00
Pavel Chupin
e007775f4b
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>
2012-09-13 12:03:06 +04:00
jeffhao
acf5aa76a5
Added new test for dlopen which is failing for MIPS.
...
Change-Id: I2240faefb387a11647f49b1a15699907a40f98c1
2012-09-12 19:19:13 -07:00
Elliott Hughes
218c7f5dbe
am 7f598671
: am ccd7ee62
: am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '7f59867170653a62fb1fbce91bca5f4673be065d':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 17:02:36 -07:00
The Android Open Source Project
b8ceb988ea
am 76a3777a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '76a3777a4d6c3233ba2935828371abd3fbbac843':
2012-09-12 16:58:49 -07:00
Elliott Hughes
cf57515f70
am f801cf55
: resolved conflicts for merge of 47bda0c2
to jb-mr1-dev
...
* commit 'f801cf55bebc8d0d397fbe6db8cc91b3afb78149':
Update the kernel headers to match external/kernel-headers.
2012-09-12 16:11:21 -07:00
Elliott Hughes
f801cf55be
resolved conflicts for merge of 47bda0c2
to jb-mr1-dev
...
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
2012-09-12 16:08:14 -07:00
Elliott Hughes
47bda0c293
am 7593fa8e
: Merge "Update the kernel headers to match external/kernel-headers."
...
* commit '7593fa8eb7d8c3950a069e5edd244fb68872ec17':
Update the kernel headers to match external/kernel-headers.
2012-09-12 15:59:29 -07:00
Elliott Hughes
7593fa8eb7
Merge "Update the kernel headers to match external/kernel-headers."
2012-09-12 15:56:11 -07:00
Elliott Hughes
e290cd1606
am 68221a76
: am cc0f2253
: am 7f798147
: am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit '68221a76b7ecfe5ed5d43d76eb3b7a505bf83c0d':
[MIPS] Check error status from pipe system call
2012-09-12 15:35:00 -07:00
Elliott Hughes
86ec05acc9
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
2012-09-12 12:30:22 -07:00
Elliott Hughes
7f59867170
am ccd7ee62
: am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit 'ccd7ee624a81d61675fa08e149fe190a317341eb':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:08:30 -07:00
Elliott Hughes
ccd7ee624a
am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:07:12 -07:00
Elliott Hughes
90ae787b30
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.
2012-09-12 11:03:24 -07:00
Elliott Hughes
666d06fee9
Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
2012-09-12 10:51:48 -07:00
Elliott Hughes
0d207ba624
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
...
Change-Id: Iba58077a1f057a968eb2283ebba259975925ff4c
2012-09-12 10:51:05 -07:00
The Android Open Source Project
76a3777a4d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1cd7d82959c5e821c23be974b7eb9d4914593bef
2012-09-12 07:39:34 -07:00
The Android Automerger
5766b0932f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:18 -07:00
Elliott Hughes
68221a76b7
am cc0f2253
: am 7f798147
: am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit 'cc0f225365d7103baaba80517850489a5ff17d89':
[MIPS] Check error status from pipe system call
2012-09-11 16:48:50 -07:00
Elliott Hughes
cc0f225365
am 7f798147
: am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit '7f798147980798718ac893229ae20dba9e3a26c7':
[MIPS] Check error status from pipe system call
2012-09-11 16:47:25 -07:00
Elliott Hughes
7f79814798
am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit 'cc8668f261ae5d0ed38961f357e33c026502ed0d':
[MIPS] Check error status from pipe system call
2012-09-11 16:43:39 -07:00
Elliott Hughes
cc8668f261
Merge "[MIPS] Check error status from pipe system call"
2012-09-11 16:38:43 -07:00