Elliott Hughes
50b4523380
am aa29740c
: am 69fc1522
: am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa29740ce252113071f96872b7b99c8528bd1637':
Clean up warnings in stubs.cpp.
2012-08-13 16:28:44 -07:00
Elliott Hughes
aa29740ce2
am 69fc1522
: am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit '69fc1522a30df39fcf115f09f7665b590677ba27':
Clean up warnings in stubs.cpp.
2012-08-13 16:27:05 -07:00
Elliott Hughes
69fc1522a3
am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
Clean up warnings in stubs.cpp.
2012-08-13 16:24:38 -07:00
Elliott Hughes
aa6c8994b7
am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'b66bc51423a1f3969d0e70e035126ac4c4898b50':
Clean up warnings in stubs.cpp.
2012-08-13 16:22:43 -07:00
Elliott Hughes
b66bc51423
Merge "Clean up warnings in stubs.cpp."
2012-08-13 16:17:55 -07:00
Elliott Hughes
71c9a05614
am c37b31d8
: am eab7bddd
: am ca09412a
: am 222eec2e
: Merge "Handle naming for system uids running as secondary users"
...
* commit 'c37b31d848050b6bc534984556641f738fa0324b':
Handle naming for system uids running as secondary users
2012-08-13 16:10:32 -07:00
Elliott Hughes
66c033868f
am c64c1b49
: am ad8ff472
: am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'c64c1b49fd5c51b1b6e87d88b233d23fa172d372':
Add dependencies on all the makefiles.
2012-08-13 16:10:31 -07:00
Elliott Hughes
4a5ab7a191
am 141a3b10
: am cfd0345f
: am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '141a3b109c32acb0d7279ea85706db781bfc0594':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:10:30 -07:00
Elliott Hughes
de727caee2
Clean up warnings in stubs.cpp.
...
Switch to C++ to get extra warnings, and format the code Google style.
Change-Id: Ifc0131bf297a6ee8a8a6b8d049a02518b0b1a4b7
2012-08-13 16:10:19 -07:00
Elliott Hughes
c37b31d848
am eab7bddd
: am ca09412a
: am 222eec2e
: Merge "Handle naming for system uids running as secondary users"
...
* commit 'eab7bddd9eb585ce3992314c9e411b909c05e87b':
Handle naming for system uids running as secondary users
2012-08-13 16:07:46 -07:00
Elliott Hughes
c64c1b49fd
am ad8ff472
: am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'ad8ff472b6d80561629db4826452fddf3007bdce':
Add dependencies on all the makefiles.
2012-08-13 16:07:45 -07:00
Elliott Hughes
141a3b109c
am cfd0345f
: am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit 'cfd0345fe056cf945f5b6f61d4316536781697b4':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:07:44 -07:00
Elliott Hughes
eab7bddd9e
am ca09412a
: am 222eec2e
: Merge "Handle naming for system uids running as secondary users"
...
* commit 'ca09412a1f13c6e2df72c1efccdad1d9960ba99b':
Handle naming for system uids running as secondary users
2012-08-13 16:03:27 -07:00
Elliott Hughes
ad8ff472b6
am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'c1eb76198ec81802f69b52a8c6fbf97765d46f53':
Add dependencies on all the makefiles.
2012-08-13 16:03:26 -07:00
Elliott Hughes
cfd0345fe0
am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '35dcf19b2bcf388cda7f4c9baacb159c15c9b03f':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:03:16 -07:00
Elliott Hughes
ca09412a1f
am 222eec2e
: Merge "Handle naming for system uids running as secondary users"
...
* commit '222eec2ecfc4afcbd5cf0f08e16f69f6c3c424fa':
Handle naming for system uids running as secondary users
2012-08-13 15:00:55 -07:00
Elliott Hughes
222eec2ecf
Merge "Handle naming for system uids running as secondary users"
2012-08-13 14:45:27 -07:00
Elliott Hughes
c1eb76198e
am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit '440e417d5f8fb3ab3b5296eaea3720be52086730':
Add dependencies on all the makefiles.
2012-08-13 14:30:35 -07:00
Amith Yamasani
bf9441efb8
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
(cherry-pick of c60a0027b1ef3bc4929d2023e7083fbce12fafe7.)
Change-Id: I46eeb23fee4f57b2907640570504123d3ce99985
2012-08-13 14:19:16 -07:00
Elliott Hughes
440e417d5f
Merge "Add dependencies on all the makefiles."
2012-08-13 14:12:02 -07:00
Elliott Hughes
ae5c64413b
Add dependencies on all the makefiles.
...
This should help prevent broken builds next time I'm messing with
assembler/compiler/linker flags...
Change-Id: I30f15a3ce3c3f3c60cad7bc59aaba9f42d792224
2012-08-13 14:06:05 -07:00
Amith Yamasani
79f3698f39
am c6c26a08
: am ca7ee8a9
: Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
...
* commit 'c6c26a08c8ffd431824e13c40328c35394fb4148':
Handle naming for system uids running as secondary users
2012-08-13 13:53:55 -07:00
Amith Yamasani
c6c26a08c8
am ca7ee8a9
: Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
...
* commit 'ca7ee8a9e50d99f3d014a523460191b1e67e9c9f':
Handle naming for system uids running as secondary users
2012-08-13 13:52:07 -07:00
Amith Yamasani
ca7ee8a9e5
Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
2012-08-13 13:49:51 -07:00
Amith Yamasani
c60a0027b1
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
Change-Id: Iebe6e5702fc1ed83aa67769a12f693c1be7968ed
2012-08-13 13:35:31 -07:00
Elliott Hughes
35dcf19b2b
am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '66fba00991f03d07c72f809d033b88748f839bda':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 12:47:13 -07:00
Elliott Hughes
66fba00991
Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
2012-08-13 12:42:01 -07:00
Raghu Gandham
7d9f1c46bb
Update arch-mips/asm/unistd.h for the newer syscalls
...
Change-Id: Ie292c091cbf4b972e1b5faa7d779645c6e4442f0
2012-08-13 11:54:53 -07:00
Elliott Hughes
5dcf871abb
am 94d7f701
: am 71c0366f
: am e135d7f3
: am a61ac525
: Merge "Fix module constructor order."
...
* commit '94d7f701d1b5cda0621eb46160e11ccbeb85cdd3':
Fix module constructor order.
2012-08-13 11:15:25 -07:00
Elliott Hughes
94d7f701d1
am 71c0366f
: am e135d7f3
: am a61ac525
: Merge "Fix module constructor order."
...
* commit '71c0366fc7f5436c6cffc2f43637f487dd734444':
Fix module constructor order.
2012-08-13 11:13:18 -07:00
Elliott Hughes
71c0366fc7
am e135d7f3
: am a61ac525
: Merge "Fix module constructor order."
...
* commit 'e135d7f305c00272ce1544b8243f999bb99979ec':
Fix module constructor order.
2012-08-13 11:11:58 -07:00
Elliott Hughes
e135d7f305
am a61ac525
: Merge "Fix module constructor order."
...
* commit 'a61ac5257bea15d6cbfc640c03f18c2fb808b139':
Fix module constructor order.
2012-08-13 11:10:32 -07:00
Elliott Hughes
a61ac5257b
Merge "Fix module constructor order."
2012-08-13 11:06:53 -07:00
Evgeniy Stepanov
9181a5dcfe
Fix module constructor order.
...
.preinit_array goes before the constructors of LD_PRELOAD-ed libraries.
Change-Id: I1af32ce29eaf3ca4351ae8a0f7f5da5165853216
2012-08-13 11:05:47 -07:00
Nick Kralevich
f574ce603a
am 34e52129
: am 19b10419
: am 89fd9ecc
: am 20b94c0c
: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '34e5212961cb64cf690289bc94c59b3b6245694c':
linker: don't perform unnecessary mprotects
2012-08-13 09:51:48 -07:00
Nick Kralevich
34e5212961
am 19b10419
: am 89fd9ecc
: am 20b94c0c
: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '19b104193067a42806dd291a20af29ebbd1c37f0':
linker: don't perform unnecessary mprotects
2012-08-13 09:50:30 -07:00
Nick Kralevich
19b1041930
am 89fd9ecc
: am 20b94c0c
: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '89fd9eccdca0eb5aed296bd7a2003424defe970c':
linker: don't perform unnecessary mprotects
2012-08-13 09:48:17 -07:00
Nick Kralevich
89fd9eccdc
am 20b94c0c
: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '20b94c0ce99ea3d2315535091c8bcd02f831d252':
linker: don't perform unnecessary mprotects
2012-08-13 09:46:43 -07:00
Nick Kralevich
20b94c0ce9
Merge "linker: don't perform unnecessary mprotects"
2012-08-13 09:28:54 -07:00
Nick Kralevich
5135b3ae6e
linker: don't perform unnecessary mprotects
...
The linker only needs to mark the text segment as
writable iff the file has text relocations. Unnecessarily
calling mprotect when it isn't necessary is slow, and some
security enhanced kernels don't like it. Pages which are
simultaneously writable and executable are considered a no-no.
The vast majority of executables / shared libraries on Android
do NOT have text relocations.
Change-Id: Ic38ce30a99b7e33ecf21efd9c108547a58eafa35
2012-08-13 08:50:11 -07:00
The Android Automerger
df0cf64781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:09:08 -07:00
Elliott Hughes
259f4a1503
am 7261264c
: am 2a22a69e
: am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '7261264c3a336bfb6e52241c2ba80679cbba68c8':
MIPS support to the libc Makefile
2012-08-11 15:19:34 -07:00
Ben Cheng
dd8cd5d6bc
am daedcfc5
: am 9eeaa4bd
: am 7e3918eb
: am 0bf5cf87
: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit 'daedcfc595f51b1fe22b53d272cee1a142305a11':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:19:33 -07:00
Elliott Hughes
7261264c3a
am 2a22a69e
: am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '2a22a69e942cde007a1253e82be44548cfc018f8':
MIPS support to the libc Makefile
2012-08-11 15:18:04 -07:00
Ben Cheng
daedcfc595
am 9eeaa4bd
: am 7e3918eb
: am 0bf5cf87
: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit '9eeaa4bd17b7131e20ad2e36f1372605e80a1332':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:18:03 -07:00
Elliott Hughes
2a22a69e94
am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '877dc946090749ba7a71f7ae07f51aa32f966083':
MIPS support to the libc Makefile
2012-08-11 15:16:34 -07:00
Ben Cheng
9eeaa4bd17
am 7e3918eb
: am 0bf5cf87
: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit '7e3918eb62d31224fc5d1cff44d591fecd31e9d0':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:16:33 -07:00
Ying Wang
c97c5fc788
Split out LOCAL_ASFLAGS.
...
Bug: 6967574
Change-Id: I5be50d582c1cb8075039b06292cf0745a996c3c4
2012-08-11 14:23:19 -07:00
Elliott Hughes
877dc94609
am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '072a7e6ced29d9be29e38721d0ab7de0ba3f7377':
MIPS support to the libc Makefile
2012-08-11 11:51:37 -07:00
Ben Cheng
7e3918eb62
am 0bf5cf87
: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit '0bf5cf87c6b7d3de8962ba132ecfb6f0e4b84f06':
Set the dynamic field in the link map for the linker itself.
2012-08-11 11:51:36 -07:00