Scott Anderson
52bf2d5659
Add clean kernel header for uhid.
...
The original kernel header was submitted in this change:
commit 45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com>
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com>
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-16 11:56:11 -07:00
Elliott Hughes
93a9d53485
am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
Fix nice...
2012-08-13 17:14:40 -07:00
Elliott Hughes
d544bdfac8
am 54655eaf
: Merge "Fix nice..."
...
* commit '54655eaf92ca91bfe2fa293896059a181e27b6eb':
Fix nice...
2012-08-13 17:12:48 -07:00
Elliott Hughes
54655eaf92
Merge "Fix nice..."
2012-08-13 16:56:18 -07:00
Elliott Hughes
3d2d448af1
Fix nice...
...
...by switching to the NetBSD implementation.
Change-Id: I562b27b237a24ded95804035cc322c7bff12ff59
2012-08-13 16:38:29 -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
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
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
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
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
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
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
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
Elliott Hughes
072a7e6ced
Merge "MIPS support to the libc Makefile"
2012-08-11 09:36:05 -07:00
Raghu Gandham
a4c7933b49
MIPS support to the libc Makefile
...
Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-10 17:24:02 -07:00
Ben Cheng
0bf5cf87c6
Merge "Set the dynamic field in the link map for the linker itself."
2012-08-10 16:46:09 -07:00
Ben Cheng
06f0e74a2b
Set the dynamic field in the link map for the linker itself.
...
Otherwise gdb will print a spurious warning each time gdb is used:
warning: .dynamic section for "/system/bin/linker" is not at the expected
address (wrong library or version mismatch?)
BUG:6946614
Change-Id: Ib21b8db0615751189c1601140deb43bc089289b6
2012-08-10 16:07:02 -07:00
Elliott Hughes
0837c69a63
am edf09bf9
: am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:17:05 -07:00
Elliott Hughes
edf09bf990
am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit '316ee626b729e3f66a5505a20128af26440cfd19':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:15:23 -07:00
Elliott Hughes
316ee626b7
Merge "MIPS support to sigsuspend and sigwait routines"
2012-08-10 15:05:36 -07:00
Nick Kralevich
73d99958bb
am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00
Nick Kralevich
fabeb736e9
am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit '38a02b4b80f50aa1b3e2ee39e9e98146cf42be3d':
crtend*: Add GNU_STACK note
2012-08-10 14:42:11 -07:00
Nick Kralevich
38a02b4b80
Merge "crtend*: Add GNU_STACK note"
2012-08-10 14:29:27 -07:00
Elliott Hughes
d71ada630d
am 535477ca
: am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '535477ca5e29f3c14dff11ac362423156b5971ec':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:12:08 -07:00
Nick Kralevich
6eee1fc68f
crtend*: Add GNU_STACK note
...
Add a GNU_STACK marker to crtend* files. This tells the linker
that these files do not require an executable stack.
When linking, a missing GNU_STACK marker in any .o file can prevent
the compiler from automatically marking the final executable as NX
safe (executable stack not required). In Android, we normally work
around this by adding -Wa,--noexecstack / -Wl,-z,noexecstack.
For files like crtend.S / crtend_so.S, which are included in every
executable / shared library, it's better to add the GNU_STACK note
directly to the assembly file. This allows the compiler to
automatically mark the final executable as NX safe without any
special command line options.
References: http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
Change-Id: I07bd058f9f60ddd8b146e0fb36ba26ff84c0357d
2012-08-10 14:12:00 -07:00
Elliott Hughes
535477ca5e
am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '3ede900b644c2a7c2fa41177b81735c8a09bd14a':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:10:03 -07:00
Elliott Hughes
3ede900b64
Merge "Revert "Revert "Switch to NetBSD's strxfrm(3)."""
2012-08-10 14:03:06 -07:00
Elliott Hughes
5adc7fdc2b
am b54e5f2a
: am a1822dce
: Merge "Add unshare() syscall."
...
* commit 'b54e5f2a2fd014a5cbf105daea7b2eb8b59dec29':
Add unshare() syscall.
2012-08-10 13:06:35 -07:00