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
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
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
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
KwongYuan Wong
b03bc56b79
[MIPS] Check error status from pipe system call
...
Change-Id: Iaaea0e826c2678aa7f6fad9d46b16302a4d3b876
2012-09-11 16:38:04 -07:00
The Android Automerger
49b5eb4ded
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:14 -07:00
Elliott Hughes
eeabbaee88
am f50b99f4
: am e8b4d67a
: am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'f50b99f471a9af07b2dec6ac3fe1abca5ba9a20b':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:06:50 -07:00
Elliott Hughes
f50b99f471
am e8b4d67a
: am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'e8b4d67a37e27ffc34086562ad13dcd9316a8249':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:04:28 -07:00
Elliott Hughes
e8b4d67a37
am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:01:04 -07:00
Elliott Hughes
59726beda5
Merge "Rename crtstart variables as crtbegin, to match reality."
2012-09-10 11:52:12 -07:00
Elliott Hughes
12949e5d39
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
2012-09-10 11:16:12 -07:00
Ying Wang
33d552a4d1
am e3738414
: am f9920563
: am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'e3738414a62f9c9b43e158af590d127b9659030d':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:09:13 -07:00
Ying Wang
e3738414a6
am f9920563
: am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:07:17 -07:00
Ying Wang
f9920563da
am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit '67546bf209b2c5480aa4811b2bb3c42e7862af62':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:05:14 -07:00
Ying Wang
67546bf209
Merge "Generate header dependency makefiles for the crt*.o"
2012-09-10 09:48:46 -07:00
The Android Automerger
9209fd3868
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 06:59:39 -07:00
Elliott Hughes
934e18e715
am af4371b4
: am 56ba6336
: am f1d57e16
: Merge "Add more pthreads tests."
...
* commit 'af4371b46b71116bd40b6ef1eb32fdfc301a38e9':
Add more pthreads tests.
2012-09-07 20:36:20 -07:00
Elliott Hughes
af4371b46b
am 56ba6336
: am f1d57e16
: Merge "Add more pthreads tests."
...
* commit '56ba6336d9c07cdfb5af2324aaa52da0c8d00ef2':
Add more pthreads tests.
2012-09-07 20:35:01 -07:00
Elliott Hughes
56ba6336d9
am f1d57e16
: Merge "Add more pthreads tests."
...
* commit 'f1d57e16686153b69a27c1eb9e339c77232c0edd':
Add more pthreads tests.
2012-09-07 18:38:41 -07:00
Elliott Hughes
f1d57e1668
Merge "Add more pthreads tests."
2012-09-07 18:30:18 -07:00
Ying Wang
cf464878ef
Generate header dependency makefiles for the crt*.o
...
Bug: 7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-07 17:13:37 -07:00
Elliott Hughes
4d014e15b4
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
2012-09-07 16:47:54 -07:00
Elliott Hughes
5804b88a44
am b0102454
: am 7c7a7f8e
: am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit 'b010245490f50601b13ee17238e31162b6143d71':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:11:35 -07:00
Elliott Hughes
ffcb92e779
am b18d4f63
: am 72fcdbe9
: am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit 'b18d4f6361c4ae011c7661da46ad0501eecba591':
Add mlockall and munlockall for Google TV.
2012-09-07 11:11:34 -07:00
Elliott Hughes
b010245490
am 7c7a7f8e
: am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361
am 72fcdbe9
: am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Elliott Hughes
7c7a7f8e52
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
2012-09-07 11:07:13 -07:00
Elliott Hughes
72fcdbe902
am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit '691ef3c80b4af278aa90d6e005ba42de1e52c140':
Add mlockall and munlockall for Google TV.
2012-09-07 11:07:10 -07:00