Nick Kralevich
62bb090f8e
resolved conflicts for merge of 5b661481
to master
...
Change-Id: Ifc68a87a95187b61f7f42a0217af43e14db6d4f8
2013-03-29 17:36:52 -07:00
Elliott Hughes
113054c4eb
am e59ecd32
: am 6bb17dfa
: Merge "Extra logging in pthread_create."
...
* commit 'e59ecd32798b08e59b4813b3ed8859e5dac5297c':
Extra logging in pthread_create.
2013-03-29 16:58:02 -07:00
Nick Kralevich
5b661481a8
am b24b6e14
: Merge "resolv_cache: hide some libc private functions" into jb-mr2-dev
...
* commit 'b24b6e1419382146f85571cdda27d48fb348141d':
resolv_cache: hide some libc private functions
2013-03-29 16:55:20 -07:00
Nick Kralevich
b24b6e1419
Merge "resolv_cache: hide some libc private functions" into jb-mr2-dev
2013-03-29 23:53:40 +00:00
Elliott Hughes
e59ecd3279
am 6bb17dfa
: Merge "Extra logging in pthread_create."
...
* commit '6bb17dfad36edda68da46c2bf68c4297a160ab8a':
Extra logging in pthread_create.
2013-03-29 16:53:02 -07:00
Elliott Hughes
6bb17dfad3
Merge "Extra logging in pthread_create."
2013-03-29 23:47:24 +00:00
Elliott Hughes
cfa089df23
Extra logging in pthread_create.
...
pthread_create returns EAGAIN when it can't allocate a pthread_internal_t,
when it can't allocate a stack for the new thread, or when clone(2) fails
because there are too many threads. It's useful to be able to know why your
pthread_create just failed, so add some logging.
Bug: 8470684
Change-Id: I1bb4497d4f7528eacce0db35c2014771cba64569
2013-03-29 16:35:00 -07:00
Nick Kralevich
c01274c4aa
resolv_cache: hide some libc private functions
...
Don't export unnecessary symbols to third party apps.
Bug: 8401049
Change-Id: Ide5abd6ed13e756a85bd1277d93da74d1419addb
2013-03-29 13:56:05 -07:00
The Android Open Source Project
2903a0bac3
am f9e4a6e9
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'f9e4a6e93b2d0ca6f2fd01547a04b63a94257a29':
2013-03-29 09:50:35 -07:00
The Android Open Source Project
f9e4a6e93b
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie2c8eed6e2ee90bc1d1a59184a503f9dd0dcdc80
2013-03-29 09:48:32 -07:00
Jean-Baptiste Queru
a3ce0bb1ad
am a3de6b47
: am d02dd19d
: am 267290b3
: am 74b324ac
: Merge "Update processed linux/fs.h header file"
...
* commit 'a3de6b47bf444c6efbf386e01e70bc61f9c559de':
Update processed linux/fs.h header file
2013-03-28 09:02:06 -07:00
Jean-Baptiste Queru
a3de6b47bf
am d02dd19d
: am 267290b3
: am 74b324ac
: Merge "Update processed linux/fs.h header file"
...
* commit 'd02dd19d51fd78c4cfea8be4eaba3df1668910c4':
Update processed linux/fs.h header file
2013-03-28 09:01:01 -07:00
Jean-Baptiste Queru
d02dd19d51
am 267290b3
: am 74b324ac
: Merge "Update processed linux/fs.h header file"
...
* commit '267290b340bee74e5ebbbc60f8c5a9b2a5453957':
Update processed linux/fs.h header file
2013-03-28 08:59:25 -07:00
Jean-Baptiste Queru
267290b340
am 74b324ac
: Merge "Update processed linux/fs.h header file"
...
* commit '74b324ac09db35d29d16695e9b9c1f0601599812':
Update processed linux/fs.h header file
2013-03-28 08:57:23 -07:00
Jean-Baptiste Queru
74b324ac09
Merge "Update processed linux/fs.h header file"
2013-03-28 15:49:04 +00:00
The Android Automerger
8398f82ddd
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:55:13 -07:00
Ken Sumrall
ce636ca088
Update processed linux/fs.h header file
...
Need to get the defintion of the FITRIM ioctl(). Also need
to update the blk_types.h header file as fs.h includes it.
Change-Id: I617622b620925942dc5aead9e49f8e17d17e5d74
2013-03-27 16:05:22 -07:00
Ken Sumrall
6ed55e06fd
am 024f418a
: am 887049e4
: Merge "Update processed linux/fs.h header file" into jb-mr2-dev
...
* commit '024f418af284d79e2d307489f33d67b6c564a112':
Update processed linux/fs.h header file
2013-03-27 14:18:37 -07:00
Ken Sumrall
024f418af2
am 887049e4
: Merge "Update processed linux/fs.h header file" into jb-mr2-dev
...
* commit '887049e46bdd5c14cc00837f959a0195780118a9':
Update processed linux/fs.h header file
2013-03-27 14:16:47 -07:00
Ken Sumrall
887049e46b
Merge "Update processed linux/fs.h header file" into jb-mr2-dev
2013-03-27 21:15:29 +00:00
The Android Open Source Project
416d231f97
am fd59d4d3
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528':
2013-03-26 12:17:40 -07:00
The Android Open Source Project
fd59d4d3ea
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icad78517674982f0ed6f87a7cc72a4d5b74a519f
2013-03-26 10:49:00 -07:00
The Android Automerger
6147c2941e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:55:11 -07:00
Elliott Hughes
d74b3bb1cb
am c813182d
: am da2c1586
: am 8a6abe38
: am bd014c2e
: Merge "Remove some dead script code and fix a script comment."
...
* commit 'c813182d20fa853d944cb9b4dc5c3f1a4d1c7728':
Remove some dead script code and fix a script comment.
2013-03-25 21:40:33 +00:00
Elliott Hughes
c813182d20
am da2c1586
: am 8a6abe38
: am bd014c2e
: Merge "Remove some dead script code and fix a script comment."
...
* commit 'da2c158645e10671de990bb71b307d90035320a4':
Remove some dead script code and fix a script comment.
2013-03-25 21:38:40 +00:00
Elliott Hughes
da2c158645
am 8a6abe38
: am bd014c2e
: Merge "Remove some dead script code and fix a script comment."
...
* commit '8a6abe380d2ba513bb714e54a74f4289089cbc18':
Remove some dead script code and fix a script comment.
2013-03-25 14:36:24 -07:00
Elliott Hughes
8a6abe380d
am bd014c2e
: Merge "Remove some dead script code and fix a script comment."
...
* commit 'bd014c2e4246d6e64a6523c73b9a72f379255526':
Remove some dead script code and fix a script comment.
2013-03-25 14:34:06 -07:00
Elliott Hughes
bd014c2e42
Merge "Remove some dead script code and fix a script comment."
2013-03-25 21:20:22 +00:00
Elliott Hughes
69684aa312
am 94510371
: am 999dff0e
: am a850ad4c
: am e51d75a9
: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit '94510371951bc28f97cdb55df74be26fcebdc1e4':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 21:12:59 +00:00
Elliott Hughes
9451037195
am 999dff0e
: am a850ad4c
: am e51d75a9
: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit '999dff0ef3d92c1e84d12d3b8d8324c5ef441b85':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 21:10:49 +00:00
Elliott Hughes
e6ddfc55c8
Remove some dead script code and fix a script comment.
...
Change-Id: I91ca466d1b6f8a39da50ce61acebc268d0daab3a
2013-03-25 14:09:52 -07:00
Elliott Hughes
999dff0ef3
am a850ad4c
: am e51d75a9
: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit 'a850ad4cf44e998e24f43df723b6928e42f8294d':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 14:05:54 -07:00
Elliott Hughes
a850ad4cf4
am e51d75a9
: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit 'e51d75a9acef86008f4d64cf482bbc65e24dc66c':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 14:03:38 -07:00
Elliott Hughes
e51d75a9ac
Merge "Clarify the dlmalloc USAGE_ERROR."
2013-03-25 20:54:14 +00:00
Elliott Hughes
65a8eb606f
Clarify the dlmalloc USAGE_ERROR.
...
Bug: 8468088
Change-Id: I1ff6d51ec17fc74ef56229aa76d2986cbd662874
2013-03-25 13:48:41 -07:00
Dima Zavin
e24ec2ad4c
am bb06498d
: am 369f9234
: Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
...
* commit 'bb06498d89dd002a17bad6666276580c94da1749':
libc/arm: add cortex-a7 cpu variant
2013-03-25 19:44:54 +00:00
Dima Zavin
bb06498d89
am 369f9234
: Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
...
* commit '369f92349fc784f6c14ad30f5806f708a8f2c7f7':
libc/arm: add cortex-a7 cpu variant
2013-03-25 19:43:41 +00:00
Dima Zavin
369f92349f
Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
2013-03-25 19:42:28 +00:00
Elliott Hughes
7a7d39c3f0
am c538edc1
: am c82b339a
: am 3c1504d9
: am 48f25cef
: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit 'c538edc1e85b7df35852cf9fbc472b29683fc4a3':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 17:31:28 +00:00
Elliott Hughes
263be8b1a0
am 053ceea1
: am 9386a33e
: am 93f3811b
: am a4075118
: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '053ceea1172a399b9fddf0ab010cff535c65be0e':
Unhide __set_errno for backwards compatibility.
2013-03-25 17:31:27 +00:00
Elliott Hughes
c538edc1e8
am c82b339a
: am 3c1504d9
: am 48f25cef
: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit 'c82b339a7da4dc36e644f5037c3868155fe454e4':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 17:29:11 +00:00
Elliott Hughes
053ceea117
am 9386a33e
: am 93f3811b
: am a4075118
: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '9386a33ea005fc008ff7ce0558d24e5ac68a6430':
Unhide __set_errno for backwards compatibility.
2013-03-25 17:29:10 +00:00
Elliott Hughes
c82b339a7d
am 3c1504d9
: am 48f25cef
: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit '3c1504d9d7d529b8281a447dc69af3ecf6b5ec83':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 10:24:42 -07:00
Elliott Hughes
9386a33ea0
am 93f3811b
: am a4075118
: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '93f3811b744b2100d0f259916876965c242cd3d9':
Unhide __set_errno for backwards compatibility.
2013-03-25 10:24:42 -07:00
Elliott Hughes
3c1504d9d7
am 48f25cef
: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit '48f25cef45f8f68567d528a5d833ed45cb760bec':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 10:22:43 -07:00
Elliott Hughes
93f3811b74
am a4075118
: Merge "Unhide __set_errno for backwards compatibility."
...
* commit 'a40751185f3a7245f73afb45382c23f71dbbcfc3':
Unhide __set_errno for backwards compatibility.
2013-03-25 10:22:43 -07:00
Elliott Hughes
48f25cef45
Merge "Stop generating <sys/linux-syscalls.h>."
2013-03-25 17:13:26 +00:00
Elliott Hughes
a40751185f
Merge "Unhide __set_errno for backwards compatibility."
2013-03-25 17:12:19 +00:00
The Android Automerger
af66ca6b19
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:55:24 -07:00
Dima Zavin
0c973d7049
libc/arm: add cortex-a7 cpu variant
...
Change-Id: I541d665805ea69ca96bb6a5f4d50e56287f8c08c
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-23 01:38:22 -07:00