OSDN Git Service

android-x86/bionic.git
12 years agoam 4d63f33c: am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the...
Elliott Hughes [Thu, 16 Aug 2012 00:09:38 +0000 (17:09 -0700)]
am 4d63f33c: am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."

* commit '4d63f33cdc74c340c13b96143833f669835764f2':
  Regenerate all NOTICE files with the latest version of the script.

12 years agoam 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version...
Elliott Hughes [Thu, 16 Aug 2012 00:07:59 +0000 (17:07 -0700)]
am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."

* commit '76aad1d2746f62aaaacdf717b4f51fa45560521d':
  Regenerate all NOTICE files with the latest version of the script.

12 years agoam e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
Elliott Hughes [Thu, 16 Aug 2012 00:06:51 +0000 (17:06 -0700)]
am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."

* commit 'e1cd69a708d30fbc3b9e0e8d4db67f67fc123b65':
  Regenerate all NOTICE files with the latest version of the script.

12 years agoMerge "Regenerate all NOTICE files with the latest version of the script."
Elliott Hughes [Wed, 15 Aug 2012 23:51:56 +0000 (16:51 -0700)]
Merge "Regenerate all NOTICE files with the latest version of the script."

12 years agoam 2e3756b4: am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex...
Elliott Hughes [Wed, 15 Aug 2012 23:01:22 +0000 (16:01 -0700)]
am 2e3756b4: am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."

* commit '2e3756b4d36c9b7f6a892b87757d41b3201b9773':
  Switch to the current NetBSD regex implementation.

12 years agoam 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."
Elliott Hughes [Wed, 15 Aug 2012 22:59:44 +0000 (15:59 -0700)]
am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."

* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
  Switch to the current NetBSD regex implementation.

12 years agoam fe43c768: Merge "Switch to the current NetBSD regex implementation."
Elliott Hughes [Wed, 15 Aug 2012 22:58:39 +0000 (15:58 -0700)]
am fe43c768: Merge "Switch to the current NetBSD regex implementation."

* commit 'fe43c768ec803a1febde0424bb5e69c343dd7ae9':
  Switch to the current NetBSD regex implementation.

12 years agoRegenerate all NOTICE files with the latest version of the script.
Elliott Hughes [Wed, 15 Aug 2012 22:43:13 +0000 (15:43 -0700)]
Regenerate all NOTICE files with the latest version of the script.

This sorts every entry, so we should have more stability and fewer
merge conflicts in future.

Change-Id: Ifc5347dc53352da22c82d41ca59b483966fcfc6b

12 years agoMerge "Switch to the current NetBSD regex implementation."
Elliott Hughes [Wed, 15 Aug 2012 22:39:49 +0000 (15:39 -0700)]
Merge "Switch to the current NetBSD regex implementation."

12 years agoSwitch to the current NetBSD regex implementation.
Elliott Hughes [Tue, 14 Aug 2012 22:32:42 +0000 (15:32 -0700)]
Switch to the current NetBSD regex implementation.

Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 15 Aug 2012 15:26:11 +0000 (08:26 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I2f6d32a6bc10f17d85930b21c2ac55c91d5e252e

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 15 Aug 2012 13:33:26 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoam 82259117: am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:46:26 +0000 (15:46 -0700)]
am 82259117: am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."

* commit '82259117753adffdab3ce74efb12d30a5289ad2b':
  Sort NOTICE entries.

12 years agoam 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:43:57 +0000 (15:43 -0700)]
am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."

* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
  Sort NOTICE entries.

12 years agoam 53493a9b: Merge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:42:36 +0000 (15:42 -0700)]
am 53493a9b: Merge "Sort NOTICE entries."

* commit '53493a9b26e9fb665de590abf3502af94eaf3f44':
  Sort NOTICE entries.

12 years agoam df88d88f: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
Iliyan Malchev [Tue, 14 Aug 2012 22:41:38 +0000 (15:41 -0700)]
am df88d88f: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev

* commit 'df88d88f56f37cdf75ab03c6b68a42010d9ac6c7':
  update msm_mdp.h header to support vsync
  update processed msm_camera.h and msm_isp.h

12 years agoMerge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
Iliyan Malchev [Tue, 14 Aug 2012 22:40:21 +0000 (15:40 -0700)]
Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev

* changes:
  update msm_mdp.h header to support vsync
  update processed msm_camera.h and msm_isp.h

12 years agoMerge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:31:17 +0000 (15:31 -0700)]
Merge "Sort NOTICE entries."

12 years agoam fdbecf3b: am 63696738: am b6a97196: Merge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 22:13:10 +0000 (15:13 -0700)]
am fdbecf3b: am 63696738: am b6a97196: Merge "More cleanup."

* commit 'fdbecf3b5a16f8e35e1ad67ec9c807eb66e2ac3b':
  More cleanup.

12 years agoam 63696738: am b6a97196: Merge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 22:10:51 +0000 (15:10 -0700)]
am 63696738: am b6a97196: Merge "More cleanup."

* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
  More cleanup.

12 years agoam b6a97196: Merge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 22:08:38 +0000 (15:08 -0700)]
am b6a97196: Merge "More cleanup."

* commit 'b6a971962acdf2684fd98658ec6fe6aa9952d84b':
  More cleanup.

12 years agoSort NOTICE entries.
Elliott Hughes [Tue, 14 Aug 2012 22:04:05 +0000 (15:04 -0700)]
Sort NOTICE entries.

Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.

Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592

12 years agoMerge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 22:02:40 +0000 (15:02 -0700)]
Merge "More cleanup."

12 years agoMore cleanup.
Elliott Hughes [Tue, 14 Aug 2012 21:07:59 +0000 (14:07 -0700)]
More cleanup.

Make more stuff static, remove some dead code, and fix a few typos.

Change-Id: I010b0eadeaf61e2899c37014ad1e7082c70bd510

12 years agoupdate msm_mdp.h header to support vsync
Naseer Ahmed [Wed, 1 Aug 2012 00:26:00 +0000 (17:26 -0700)]
update msm_mdp.h header to support vsync

Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f

12 years agoupdate processed msm_camera.h and msm_isp.h
Ajay Dudani [Thu, 9 Aug 2012 16:58:59 +0000 (09:58 -0700)]
update processed msm_camera.h and msm_isp.h

Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84

12 years agoam 89a35435: am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare...
Elliott Hughes [Tue, 14 Aug 2012 19:31:15 +0000 (12:31 -0700)]
am 89a35435: am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."

* commit '89a3543568ffedb54473f961f36f17d211d9c7e1':
  Update MS_ mount flags, define unshare() syscall.

12 years agoam 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
Elliott Hughes [Tue, 14 Aug 2012 19:29:01 +0000 (12:29 -0700)]
am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."

* commit '16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
  Update MS_ mount flags, define unshare() syscall.

12 years agoam b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
Elliott Hughes [Tue, 14 Aug 2012 19:27:44 +0000 (12:27 -0700)]
am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."

* commit 'b7c6991c9af3882bd13cbf6bc42da85c884aa5f5':
  Update MS_ mount flags, define unshare() syscall.

12 years agoam dc320d99: am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic...
Elliott Hughes [Tue, 14 Aug 2012 19:17:27 +0000 (12:17 -0700)]
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

12 years agoam b6d6ec53: am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind...
Elliott Hughes [Tue, 14 Aug 2012 19:17:26 +0000 (12:17 -0700)]
am b6d6ec53: am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."

* commit 'b6d6ec5326a016e60d2bd82edf857aaec6d5ce95':
  Switch to upstream NetBSD tdelete/tfind/tsearch.

12 years agoMerge "Update MS_ mount flags, define unshare() syscall."
Elliott Hughes [Tue, 14 Aug 2012 19:14:29 +0000 (12:14 -0700)]
Merge "Update MS_ mount flags, define unshare() syscall."

12 years agoam 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of...
Elliott Hughes [Tue, 14 Aug 2012 19:14:13 +0000 (12:14 -0700)]
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

12 years agoam 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
Elliott Hughes [Tue, 14 Aug 2012 19:14:12 +0000 (12:14 -0700)]
am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."

* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
  Switch to upstream NetBSD tdelete/tfind/tsearch.

12 years agoam b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
Elliott Hughes [Tue, 14 Aug 2012 19:11:54 +0000 (12:11 -0700)]
am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"

* commit 'b9c6854cd9d5286f991aec66be3a8a57f5e3e7be':
  linker: avoid clobbering the .dynamic section of shared libs

12 years agoam c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
Elliott Hughes [Tue, 14 Aug 2012 19:11:53 +0000 (12:11 -0700)]
am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."

* commit 'c50e019734fb379e2efc1d50e188dd51cf085b96':
  Switch to upstream NetBSD tdelete/tfind/tsearch.

12 years agoUpdate MS_ mount flags, define unshare() syscall.
Jeff Sharkey [Sat, 11 Aug 2012 21:12:26 +0000 (14:12 -0700)]
Update MS_ mount flags, define unshare() syscall.

(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)

Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d

12 years agoMerge "linker: avoid clobbering the .dynamic section of shared libs"
Elliott Hughes [Tue, 14 Aug 2012 19:07:17 +0000 (12:07 -0700)]
Merge "linker: avoid clobbering the .dynamic section of shared libs"

12 years agoam d8450043: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
Jeff Sharkey [Tue, 14 Aug 2012 19:06:36 +0000 (12:06 -0700)]
am d8450043: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev

* commit 'd8450043b060358e1235a1f052d63aa4527b2400':
  Update MS_ mount flags, define unshare() syscall.

12 years agoMerge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
Jeff Sharkey [Tue, 14 Aug 2012 19:05:45 +0000 (12:05 -0700)]
Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev

12 years agoMerge "Switch to upstream NetBSD tdelete/tfind/tsearch."
Elliott Hughes [Tue, 14 Aug 2012 18:56:29 +0000 (11:56 -0700)]
Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."

12 years agoUpdate MS_ mount flags, define unshare() syscall.
Jeff Sharkey [Sat, 11 Aug 2012 21:12:26 +0000 (14:12 -0700)]
Update MS_ mount flags, define unshare() syscall.

Bug: 6925012
Change-Id: I4ad79b4bccb7737d4dc704476cdb5795d124f53e

12 years agolinker: avoid clobbering the .dynamic section of shared libs
Ard Biesheuvel [Tue, 14 Aug 2012 10:30:09 +0000 (12:30 +0200)]
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>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 14 Aug 2012 14:06:10 +0000 (07:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoSwitch to upstream NetBSD tdelete/tfind/tsearch.
Elliott Hughes [Tue, 14 Aug 2012 00:02:11 +0000 (17:02 -0700)]
Switch to upstream NetBSD tdelete/tfind/tsearch.

tdestroy is a GNU extension, so that stays.

Change-Id: Iedebaff25ea7e92b1ab1dd4440da12b67b99aa40

12 years agoam 93a9d534: am d544bdfa: am 54655eaf: Merge "Fix nice..."
Elliott Hughes [Tue, 14 Aug 2012 00:15:40 +0000 (17:15 -0700)]
am 93a9d534: am d544bdfa: am 54655eaf: Merge "Fix nice..."

* commit '93a9d53485677fb5b897a127b27e6bdbc40911c7':
  Fix nice...

12 years agoam d544bdfa: am 54655eaf: Merge "Fix nice..."
Elliott Hughes [Tue, 14 Aug 2012 00:14:40 +0000 (17:14 -0700)]
am d544bdfa: am 54655eaf: Merge "Fix nice..."

* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
  Fix nice...

12 years agoam 54655eaf: Merge "Fix nice..."
Elliott Hughes [Tue, 14 Aug 2012 00:12:48 +0000 (17:12 -0700)]
am 54655eaf: Merge "Fix nice..."

* commit '54655eaf92ca91bfe2fa293896059a181e27b6eb':
  Fix nice...

12 years agoMerge "Fix nice..."
Elliott Hughes [Mon, 13 Aug 2012 23:56:17 +0000 (16:56 -0700)]
Merge "Fix nice..."

12 years agoFix nice...
Elliott Hughes [Mon, 13 Aug 2012 23:38:29 +0000 (16:38 -0700)]
Fix nice...

...by switching to the NetBSD implementation.

Change-Id: I562b27b237a24ded95804035cc322c7bff12ff59

12 years agoam 69fc1522: am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."
Elliott Hughes [Mon, 13 Aug 2012 23:27:05 +0000 (16:27 -0700)]
am 69fc1522: am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."

* commit '69fc1522a30df39fcf115f09f7665b590677ba27':
  Clean up warnings in stubs.cpp.

12 years agoam aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."
Elliott Hughes [Mon, 13 Aug 2012 23:24:38 +0000 (16:24 -0700)]
am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."

* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
  Clean up warnings in stubs.cpp.

12 years agoam b66bc514: Merge "Clean up warnings in stubs.cpp."
Elliott Hughes [Mon, 13 Aug 2012 23:22:43 +0000 (16:22 -0700)]
am b66bc514: Merge "Clean up warnings in stubs.cpp."

* commit 'b66bc51423a1f3969d0e70e035126ac4c4898b50':
  Clean up warnings in stubs.cpp.

12 years agoMerge "Clean up warnings in stubs.cpp."
Elliott Hughes [Mon, 13 Aug 2012 23:17:54 +0000 (16:17 -0700)]
Merge "Clean up warnings in stubs.cpp."

12 years agoClean up warnings in stubs.cpp.
Elliott Hughes [Mon, 13 Aug 2012 22:45:36 +0000 (15:45 -0700)]
Clean up warnings in stubs.cpp.

Switch to C++ to get extra warnings, and format the code Google style.

Change-Id: Ifc0131bf297a6ee8a8a6b8d049a02518b0b1a4b7

12 years agoam eab7bddd: am ca09412a: am 222eec2e: Merge "Handle naming for system uids running...
Elliott Hughes [Mon, 13 Aug 2012 23:07:46 +0000 (16:07 -0700)]
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

12 years agoam ad8ff472: am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."
Elliott Hughes [Mon, 13 Aug 2012 23:07:45 +0000 (16:07 -0700)]
am ad8ff472: am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."

* commit 'ad8ff472b6d80561629db4826452fddf3007bdce':
  Add dependencies on all the makefiles.

12 years agoam cfd0345f: am 35dcf19b: am 66fba009: Merge "Update arch-mips/asm/unistd.h for the...
Elliott Hughes [Mon, 13 Aug 2012 23:07:44 +0000 (16:07 -0700)]
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

12 years agoam ca09412a: am 222eec2e: Merge "Handle naming for system uids running as secondary...
Elliott Hughes [Mon, 13 Aug 2012 23:03:27 +0000 (16:03 -0700)]
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

12 years agoam c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."
Elliott Hughes [Mon, 13 Aug 2012 23:03:26 +0000 (16:03 -0700)]
am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."

* commit 'c1eb76198ec81802f69b52a8c6fbf97765d46f53':
  Add dependencies on all the makefiles.

12 years agoam 35dcf19b: am 66fba009: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
Elliott Hughes [Mon, 13 Aug 2012 23:03:16 +0000 (16:03 -0700)]
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

12 years agoam 222eec2e: Merge "Handle naming for system uids running as secondary users"
Elliott Hughes [Mon, 13 Aug 2012 22:00:55 +0000 (15:00 -0700)]
am 222eec2e: Merge "Handle naming for system uids running as secondary users"

* commit '222eec2ecfc4afcbd5cf0f08e16f69f6c3c424fa':
  Handle naming for system uids running as secondary users

12 years agoMerge "Handle naming for system uids running as secondary users"
Elliott Hughes [Mon, 13 Aug 2012 21:45:27 +0000 (14:45 -0700)]
Merge "Handle naming for system uids running as secondary users"

12 years agoam 440e417d: Merge "Add dependencies on all the makefiles."
Elliott Hughes [Mon, 13 Aug 2012 21:30:35 +0000 (14:30 -0700)]
am 440e417d: Merge "Add dependencies on all the makefiles."

* commit '440e417d5f8fb3ab3b5296eaea3720be52086730':
  Add dependencies on all the makefiles.

12 years agoHandle naming for system uids running as secondary users
Amith Yamasani [Mon, 13 Aug 2012 02:51:34 +0000 (19:51 -0700)]
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

12 years agoMerge "Add dependencies on all the makefiles."
Elliott Hughes [Mon, 13 Aug 2012 21:12:02 +0000 (14:12 -0700)]
Merge "Add dependencies on all the makefiles."

12 years agoAdd dependencies on all the makefiles.
Elliott Hughes [Mon, 13 Aug 2012 21:06:05 +0000 (14:06 -0700)]
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

12 years agoam ca7ee8a9: Merge "Handle naming for system uids running as secondary users" into...
Amith Yamasani [Mon, 13 Aug 2012 20:52:07 +0000 (13:52 -0700)]
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

12 years agoMerge "Handle naming for system uids running as secondary users" into jb-mr1-dev
Amith Yamasani [Mon, 13 Aug 2012 20:49:51 +0000 (13:49 -0700)]
Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev

12 years agoHandle naming for system uids running as secondary users
Amith Yamasani [Mon, 13 Aug 2012 02:51:34 +0000 (19:51 -0700)]
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

12 years agoam 66fba009: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
Elliott Hughes [Mon, 13 Aug 2012 19:47:13 +0000 (12:47 -0700)]
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

12 years agoMerge "Update arch-mips/asm/unistd.h for the newer syscalls"
Elliott Hughes [Mon, 13 Aug 2012 19:42:01 +0000 (12:42 -0700)]
Merge "Update arch-mips/asm/unistd.h for the newer syscalls"

12 years agoUpdate arch-mips/asm/unistd.h for the newer syscalls
Raghu Gandham [Mon, 13 Aug 2012 18:54:53 +0000 (11:54 -0700)]
Update arch-mips/asm/unistd.h for the newer syscalls

Change-Id: Ie292c091cbf4b972e1b5faa7d779645c6e4442f0

12 years agoam 71c0366f: am e135d7f3: am a61ac525: Merge "Fix module constructor order."
Elliott Hughes [Mon, 13 Aug 2012 18:13:18 +0000 (11:13 -0700)]
am 71c0366f: am e135d7f3: am a61ac525: Merge "Fix module constructor order."

* commit '71c0366fc7f5436c6cffc2f43637f487dd734444':
  Fix module constructor order.

12 years agoam e135d7f3: am a61ac525: Merge "Fix module constructor order."
Elliott Hughes [Mon, 13 Aug 2012 18:11:58 +0000 (11:11 -0700)]
am e135d7f3: am a61ac525: Merge "Fix module constructor order."

* commit 'e135d7f305c00272ce1544b8243f999bb99979ec':
  Fix module constructor order.

12 years agoam a61ac525: Merge "Fix module constructor order."
Elliott Hughes [Mon, 13 Aug 2012 18:10:32 +0000 (11:10 -0700)]
am a61ac525: Merge "Fix module constructor order."

* commit 'a61ac5257bea15d6cbfc640c03f18c2fb808b139':
  Fix module constructor order.

12 years agoMerge "Fix module constructor order."
Elliott Hughes [Mon, 13 Aug 2012 18:06:53 +0000 (11:06 -0700)]
Merge "Fix module constructor order."

12 years agoFix module constructor order.
Evgeniy Stepanov [Mon, 13 Aug 2012 13:58:37 +0000 (17:58 +0400)]
Fix module constructor order.

.preinit_array goes before the constructors of LD_PRELOAD-ed libraries.

Change-Id: I1af32ce29eaf3ca4351ae8a0f7f5da5165853216

12 years agoam 19b10419: am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary...
Nick Kralevich [Mon, 13 Aug 2012 16:50:30 +0000 (09:50 -0700)]
am 19b10419: am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"

* commit '19b104193067a42806dd291a20af29ebbd1c37f0':
  linker: don't perform unnecessary mprotects

12 years agoam 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"
Nick Kralevich [Mon, 13 Aug 2012 16:48:17 +0000 (09:48 -0700)]
am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"

* commit '89fd9eccdca0eb5aed296bd7a2003424defe970c':
  linker: don't perform unnecessary mprotects

12 years agoam 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"
Nick Kralevich [Mon, 13 Aug 2012 16:46:43 +0000 (09:46 -0700)]
am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"

* commit '20b94c0ce99ea3d2315535091c8bcd02f831d252':
  linker: don't perform unnecessary mprotects

12 years agoMerge "linker: don't perform unnecessary mprotects"
Nick Kralevich [Mon, 13 Aug 2012 16:28:54 +0000 (09:28 -0700)]
Merge "linker: don't perform unnecessary mprotects"

12 years agolinker: don't perform unnecessary mprotects
Nick Kralevich [Sat, 11 Aug 2012 04:08:42 +0000 (21:08 -0700)]
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

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 13 Aug 2012 15:09:08 +0000 (08:09 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoam 2a22a69e: am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"
Elliott Hughes [Sat, 11 Aug 2012 22:18:04 +0000 (15:18 -0700)]
am 2a22a69e: am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"

* commit '2a22a69e942cde007a1253e82be44548cfc018f8':
  MIPS support to the libc Makefile

12 years agoam 9eeaa4bd: am 7e3918eb: am 0bf5cf87: Merge "Set the dynamic field in the link map...
Ben Cheng [Sat, 11 Aug 2012 22:18:03 +0000 (15:18 -0700)]
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.

12 years agoam 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"
Elliott Hughes [Sat, 11 Aug 2012 22:16:34 +0000 (15:16 -0700)]
am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"

* commit '877dc946090749ba7a71f7ae07f51aa32f966083':
  MIPS support to the libc Makefile

12 years agoam 7e3918eb: am 0bf5cf87: Merge "Set the dynamic field in the link map for the linker...
Ben Cheng [Sat, 11 Aug 2012 22:16:33 +0000 (15:16 -0700)]
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.

12 years agoam 072a7e6c: Merge "MIPS support to the libc Makefile"
Elliott Hughes [Sat, 11 Aug 2012 18:51:37 +0000 (11:51 -0700)]
am 072a7e6c: Merge "MIPS support to the libc Makefile"

* commit '072a7e6ced29d9be29e38721d0ab7de0ba3f7377':
  MIPS support to the libc Makefile

12 years agoam 0bf5cf87: Merge "Set the dynamic field in the link map for the linker itself."
Ben Cheng [Sat, 11 Aug 2012 18:51:36 +0000 (11:51 -0700)]
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.

12 years agoMerge "MIPS support to the libc Makefile"
Elliott Hughes [Sat, 11 Aug 2012 16:36:05 +0000 (09:36 -0700)]
Merge "MIPS support to the libc Makefile"

12 years agoMIPS support to the libc Makefile
Raghu Gandham [Tue, 7 Aug 2012 19:23:24 +0000 (12:23 -0700)]
MIPS support to the libc Makefile

Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205

12 years agoMerge "Set the dynamic field in the link map for the linker itself."
Ben Cheng [Fri, 10 Aug 2012 23:46:09 +0000 (16:46 -0700)]
Merge "Set the dynamic field in the link map for the linker itself."

12 years agoSet the dynamic field in the link map for the linker itself.
Ben Cheng [Fri, 10 Aug 2012 23:07:02 +0000 (16:07 -0700)]
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

12 years agoam 0837c69a: am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait...
Elliott Hughes [Fri, 10 Aug 2012 22:18:59 +0000 (15:18 -0700)]
am 0837c69a: am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"

* commit '0837c69a63439b0c1bf3fbf1b93f3003fc5c9a2d':
  MIPS support to sigsuspend and sigwait routines

12 years agoam edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"
Elliott Hughes [Fri, 10 Aug 2012 22:17:05 +0000 (15:17 -0700)]
am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"

* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
  MIPS support to sigsuspend and sigwait routines

12 years agoam 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"
Elliott Hughes [Fri, 10 Aug 2012 22:15:23 +0000 (15:15 -0700)]
am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"

* commit '316ee626b729e3f66a5505a20128af26440cfd19':
  MIPS support to sigsuspend and sigwait routines

12 years agoMerge "MIPS support to sigsuspend and sigwait routines"
Elliott Hughes [Fri, 10 Aug 2012 22:05:35 +0000 (15:05 -0700)]
Merge "MIPS support to sigsuspend and sigwait routines"

12 years agoam 73d99958: am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"
Nick Kralevich [Fri, 10 Aug 2012 21:48:44 +0000 (14:48 -0700)]
am 73d99958: am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"

* commit '73d99958bb8bb4cd8f8a7632aeb7e6afaa1e38f1':
  crtend*: Add GNU_STACK note

12 years agoam fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"
Nick Kralevich [Fri, 10 Aug 2012 21:46:56 +0000 (14:46 -0700)]
am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"

* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
  crtend*: Add GNU_STACK note