The Android Automerger
2df16acc42
merge in master-release history after reset to master
2013-06-12 07:49:39 -07:00
Nick Kralevich
6d88e4e96b
am 26cc1d68
: am b6e88020
: Merge "fix unittests."
...
* commit '26cc1d6838c0c4fd18abbf6ea5a38d24aea93893':
fix unittests.
2013-06-11 16:03:32 -07:00
Nick Kralevich
26cc1d6838
am b6e88020
: Merge "fix unittests."
...
* commit 'b6e880200d1690c00cb843e59c6849a275dbfbb7':
fix unittests.
2013-06-11 15:56:42 -07:00
Nick Kralevich
b6e880200d
Merge "fix unittests."
2013-06-11 22:52:54 +00:00
Nick Kralevich
fd0325bd98
fix unittests.
...
7e6ce1a3c5
fixed abort() to raise
SIGABRT rather than causing SIGSEGV. However, the unittests were
not updated.
Fix unittests.
Change-Id: I73db194127b9b9e9440358aa94273863765a736b
2013-06-11 15:45:23 -07:00
The Android Automerger
4a0c222bb1
merge in master-release history after reset to master
2013-06-11 07:49:16 -07:00
Ben Cheng
d20a04c5cf
am 77f90de7
: am fc104f89
: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
...
* commit '77f90de728b9fa60b83b7f12a45c1113f3189cb2':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
2013-06-10 17:28:46 -07:00
Ben Cheng
77f90de728
am fc104f89
: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
...
* commit 'fc104f899d47916f76c91127caf9aeaf7b69d4ef':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
2013-06-10 17:25:31 -07:00
Ben Cheng
fc104f899d
Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
2013-06-11 00:22:14 +00:00
Ben Cheng
7e6ce1a3c5
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
...
tgkill() needs the .save stack unwinding directive to get the complete
stack trace.
BUG: https://code.google.com/p/android/issues/detail?id=16672
Change-Id: Ifb447dca2147a592c48baf32769dfc175d8aea72
2013-06-10 17:17:46 -07:00
Brian Carlstrom
b181747aa1
am d978d21d
: am 8252b8e4
: Merge "Honor p_vaddr if set"
...
* commit 'd978d21d195976fa3f257b8d17ec2fe18fb436a7':
Honor p_vaddr if set
2013-06-10 15:44:13 -07:00
Brian Carlstrom
d978d21d19
am 8252b8e4
: Merge "Honor p_vaddr if set"
...
* commit '8252b8e4b730b13623f31dc66396e000586d1c58':
Honor p_vaddr if set
2013-06-10 15:41:19 -07:00
Brian Carlstrom
8252b8e4b7
Merge "Honor p_vaddr if set"
2013-06-10 22:39:07 +00:00
Geremy Condra
72254952e1
Merge "Add clearing of resolv uid and pid interface maps"
2013-06-10 18:45:01 +00:00
The Android Automerger
5074892e0a
merge in master-release history after reset to master
2013-06-10 09:52:26 -07:00
Elliott Hughes
efc78bbb9f
am 6bcf71c9
: am 2fbc9dda
: Merge "bionic/x86: Optimization for string routines"
...
* commit '6bcf71c9ac8395038ca243160d4367759be8dd80':
bionic/x86: Optimization for string routines
2013-06-07 17:52:16 -07:00
Elliott Hughes
1b14c72420
am fc6f5a08
: am 157c4299
: Merge "Revert "libc x86: Remove strcat.S""
...
* commit 'fc6f5a086557f81fce2542b7015268bff697d10c':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:48:53 -07:00
Elliott Hughes
6bcf71c9ac
am 2fbc9dda
: Merge "bionic/x86: Optimization for string routines"
...
* commit '2fbc9dda345486005569be4ec586c6aae9d51650':
bionic/x86: Optimization for string routines
2013-06-07 17:47:33 -07:00
Elliott Hughes
2fbc9dda34
Merge "bionic/x86: Optimization for string routines"
2013-06-08 00:45:07 +00:00
Elliott Hughes
fc6f5a0865
am 157c4299
: Merge "Revert "libc x86: Remove strcat.S""
...
* commit '157c42997b7aa31b36cca63ad03dbb5a601ce347':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:44:20 -07:00
Elliott Hughes
157c42997b
Merge "Revert "libc x86: Remove strcat.S""
2013-06-08 00:42:44 +00:00
Elliott Hughes
06708df6fb
Revert "libc x86: Remove strcat.S"
...
This reverts commit 4fe461b3a6
Change-Id: Ibeb76e24f054abd7c96ad6899366c2f9bfc2a5ad
2013-06-08 00:42:35 +00:00
Christopher Ferris
b3a7db2dc2
am 83245ba4
: am 9647f797
: Merge "Implement malloc_usable_size for debug impls."
...
* commit '83245ba45facf0caff3beb18a27e6604df9094ba':
Implement malloc_usable_size for debug impls.
2013-06-07 17:36:50 -07:00
Christopher Ferris
83245ba45f
am 9647f797
: Merge "Implement malloc_usable_size for debug impls."
...
* commit '9647f797d59222cd91507d4554bf62166ba88e0a':
Implement malloc_usable_size for debug impls.
2013-06-07 15:16:30 -07:00
Christopher Ferris
9647f797d5
Merge "Implement malloc_usable_size for debug impls."
2013-06-07 22:15:33 +00:00
Christopher Ferris
885f3b9cad
Implement malloc_usable_size for debug impls.
...
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug: 6143477
Merge change from internal master.
(cherry-picked from commit 3d594c2580
)
Change-Id: I4ae00fffba82315a8c283f35893fd554460722fb
2013-06-07 14:55:32 -07:00
Chad Brubaker
87594a32b8
Add clearing of resolv uid and pid interface maps
...
Cleanup uid interface map variable names
Change-Id: I712dd83276bb23b149af4180515ef33a1bade5ea
2013-06-07 13:03:23 -07:00
Christopher Ferris
3d594c2580
Implement malloc_usable_size for debug impls.
...
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug: 6143477
Change-Id: Ieba99b58c2228c88d80afd264501004a4dadd212
2013-06-07 12:56:09 -07:00
Brian Carlstrom
e7dffe150b
Honor p_vaddr if set
...
(cherry picked from commit 88ff15c2c279d2bbe3569101b36cd2aa0931a0a9)
Change-Id: I4aabbe911d30aea8ace69e29bb6e980a4e89de90
2013-06-07 12:47:58 -07:00
Geremy Condra
a24d14c05d
Merge "Add per UID interface support to resolv cache"
2013-06-06 20:48:44 +00:00
Chad Brubaker
0c9bb49a9d
Add per UID interface support to resolv cache
...
Add methods to attach/detach UID ranges to a specific dns cache/interface.
This mirrors the already existing code for attaching specific processes to
specific interfaces but will be used to push all processes from a given
user to a specific cache/interface.
Change-Id: Ic24391e92d3ca46fcb46cc4fc53e13984dec40b3
2013-06-06 12:31:16 -07:00
Elliott Hughes
b166e699dc
am e84cfbef
: am b7b4f5b8
: Merge "update signal.h to be C90 compatable"
...
* commit 'e84cfbefd82f552490c580d35a54db4f53b6e5fb':
update signal.h to be C90 compatable
2013-06-05 18:14:30 -07:00
Elliott Hughes
e51cd6f9c9
am 5a6a0a94
: am 18af4503
: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
...
* commit '5a6a0a9445d80bf2bd847088921f6d1d99315552':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
2013-06-05 18:11:05 -07:00
Elliott Hughes
e84cfbefd8
am b7b4f5b8
: Merge "update signal.h to be C90 compatable"
...
* commit 'b7b4f5b838cd41407c734af74e8211f5c7da0036':
update signal.h to be C90 compatable
2013-06-05 18:09:17 -07:00
Elliott Hughes
b7b4f5b838
Merge "update signal.h to be C90 compatable"
2013-06-06 01:06:41 +00:00
Elliott Hughes
5a6a0a9445
am 18af4503
: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
...
* commit '18af450393b005b4ead896d82cda750e6876fd33':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
2013-06-05 18:06:04 -07:00
Erik Gilling
156ccf42ff
update signal.h to be C90 compatable
...
sigismember, sigaddset, and sigdelset had mixed code and declarations
which are not allowed in C90 and before.
Change-Id: I662af944fc1489e34bed228ce592e41f50d00e17
Signed-off-by: Erik Gilling <konkers@android.com>
2013-06-05 18:05:36 -07:00
Elliott Hughes
18af450393
Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
2013-06-06 01:04:13 +00:00
Elliott Hughes
36fa67bcdd
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
...
We keep fixing these one-by-one; let's fix them all at once.
Found thus:
find . -name *.h | xargs grep -L sys/cdefs.h | xargs grep -l BEGIN_DECL | xargs grep -L sys/types
Change-Id: I188842aa2484dc6176e96556d57c38a0f785b59b
2013-06-05 17:58:08 -07:00
Elliott Hughes
0ecb96c3a2
am b9e2dae4
: am c5bfb624
: Merge "sys/personality.h: include <sys/cdefs.h>"
...
* commit 'b9e2dae427ef1e1cfdbb3faa1442d4a66a2d3bcd':
sys/personality.h: include <sys/cdefs.h>
2013-06-05 17:32:20 -07:00
Elliott Hughes
b9e2dae427
am c5bfb624
: Merge "sys/personality.h: include <sys/cdefs.h>"
...
* commit 'c5bfb62433751579e86d5fd24cddf3ae28a49b43':
sys/personality.h: include <sys/cdefs.h>
2013-06-05 17:29:01 -07:00
Elliott Hughes
c5bfb62433
Merge "sys/personality.h: include <sys/cdefs.h>"
2013-06-06 00:28:07 +00:00
Elliott Hughes
bedd8e3de1
am ce208f33
: am 8d36050a
: Merge "Clean up useless declaration in thread_private.h"
...
* commit 'ce208f3389769026df02f7aebd85c8f5d3e74c73':
Clean up useless declaration in thread_private.h
2013-06-05 17:06:50 -07:00
Elliott Hughes
ce208f3389
am 8d36050a
: Merge "Clean up useless declaration in thread_private.h"
...
* commit '8d36050ac2bb1c4a6a04462e64c5440e3c23c9f0':
Clean up useless declaration in thread_private.h
2013-06-05 17:02:29 -07:00
Elliott Hughes
8d36050ac2
Merge "Clean up useless declaration in thread_private.h"
2013-06-06 00:00:40 +00:00
The Android Automerger
a7b5635e60
merge in master-release history after reset to master
2013-06-05 07:49:30 -07:00
Kito Cheng
328223230b
sys/personality.h: include <sys/cdefs.h>
...
Change-Id: Ia3fa558a38e0cffe5287bc454e85d5d3bdaa6ba1
2013-06-05 11:30:17 +08:00
Kito Cheng
94d0daa2dd
Clean up useless declaration in thread_private.h
...
Change-Id: Ie7bcdc7195a3fcbcd09a95f73b0c49e8897ad50b
2013-06-05 11:26:24 +08:00
Elliott Hughes
8ed5aec934
am 4b47d9f9
: am 4c001859
: Merge "Fix declaration of malloc_usable_size()"
...
* commit '4b47d9f978296e5bb2eaabb8069960eb6f207c80':
Fix declaration of malloc_usable_size()
2013-06-04 19:02:21 -07:00
Elliott Hughes
4b47d9f978
am 4c001859
: Merge "Fix declaration of malloc_usable_size()"
...
* commit '4c001859feeda27727917c5bd00338e90b801742':
Fix declaration of malloc_usable_size()
2013-06-04 19:00:03 -07:00