Elliott Hughes
a10b277de2
am bfcd5525
: am b6d6ec53
: am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'bfcd55250058e927e0c6d0b94337c89fc2d86fa2':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:21:20 -07:00
Elliott Hughes
028ed539dd
am dc320d99
: am 82b69fcb
: am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit 'dc320d99f1e09c0e42fc86f3cb28c15b77d7701b':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:17:27 -07:00
Elliott Hughes
bfcd552500
am b6d6ec53
: am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'b6d6ec5326a016e60d2bd82edf857aaec6d5ce95':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:17:26 -07:00
Elliott Hughes
b7c6991c9a
Merge "Update MS_ mount flags, define unshare() syscall."
2012-08-14 12:14:29 -07:00
Elliott Hughes
dc320d99f1
am 82b69fcb
: am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit '82b69fcbb3cc94bcde82c72d5c66fb3b504cdb6e':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:14:13 -07:00
Elliott Hughes
b6d6ec5326
am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -07:00
Elliott Hughes
82b69fcbb3
am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit 'b9c6854cd9d5286f991aec66be3a8a57f5e3e7be':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:11:54 -07:00
Elliott Hughes
370a70948a
am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'c50e019734fb379e2efc1d50e188dd51cf085b96':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:11:53 -07:00
Jeff Sharkey
0febe091a5
am 21f7ef9e
: am d8450043
: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit '21f7ef9eb269f75d7c291b4c574eabc865bf4362':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:11:01 -07:00
Jeff Sharkey
74c0464006
Update MS_ mount flags, define unshare() syscall.
...
(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)
Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d
2012-08-14 12:09:25 -07:00
Elliott Hughes
b9c6854cd9
Merge "linker: avoid clobbering the .dynamic section of shared libs"
2012-08-14 12:07:18 -07:00
Jeff Sharkey
21f7ef9eb2
am d8450043
: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit 'd8450043b060358e1235a1f052d63aa4527b2400':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:06:36 -07:00
Jeff Sharkey
d8450043b0
Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
2012-08-14 12:05:46 -07:00
Elliott Hughes
c50e019734
Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
2012-08-14 11:56:30 -07:00
Jeff Sharkey
82393decdf
Update MS_ mount flags, define unshare() syscall.
...
Bug: 6925012
Change-Id: I4ad79b4bccb7737d4dc704476cdb5795d124f53e
2012-08-14 11:45:12 -07:00
Ard Biesheuvel
12c78bbded
linker: avoid clobbering the .dynamic section of shared libs
...
This patch removes the DT_NEEDED hack which stores pointers
to soinfo structs in the .dynamic section of the library
being loaded.
Instead, it caches the soinfo struct pointers on the stack
during relocation time. After relocation time, i.e. when
calling constructors and destructors of the shared library
and its dependencies, uncached access is used instead,
doing lookups using the string table entries pointed to by
the DT_NEEDED entries.
By removing this hack, it is no longer needed to undo the
PT_GNURELRO protection, i.e., all non-writable mappings
can remain non-writable during their entire lifespan.
Even though, strictly speaking, the algorithmic complexity
has increased somewhat, the real-world adverse effect
is negligible on the systems I have tested.
Change-Id: I2361502560b96b5878f7f94a8e8a215350d70d64
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-14 19:38:28 +02:00
The Android Automerger
59b222ac75
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:06:10 -07:00
Elliott Hughes
409302f0f9
Switch to upstream NetBSD tdelete/tfind/tsearch.
...
tdestroy is a GNU extension, so that stays.
Change-Id: Iedebaff25ea7e92b1ab1dd4440da12b67b99aa40
2012-08-13 17:41:49 -07:00
Elliott Hughes
d52075bd97
am 2bc1cade
: am 93a9d534
: am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit '2bc1cadeff4b7d41c889b8f1b965028ec575bed6':
Fix nice...
2012-08-13 17:16:55 -07:00
Elliott Hughes
2bc1cadeff
am 93a9d534
: am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit '93a9d53485677fb5b897a127b27e6bdbc40911c7':
Fix nice...
2012-08-13 17:15:40 -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
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