Elliott Hughes
75501a17f2
am d18b181a
: am b6c1e34d
: am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'd18b181a25b2fa21c20ecd4faaf5c8e6e50fb35b':
Auto-generate a complete NOTICE file.
2012-08-10 12:40:35 -07:00
Elliott Hughes
d18b181a25
am b6c1e34d
: am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'b6c1e34dca58734c949b6c80d68c74104e1190e0':
Auto-generate a complete NOTICE file.
2012-08-10 12:38:37 -07:00
Elliott Hughes
b6c1e34dca
am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'dc6d5327bb6b030d154675f753d3e4f96dfa5e14':
Auto-generate a complete NOTICE file.
2012-08-10 12:36:22 -07:00
Elliott Hughes
f6922be2a5
am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit 'f91e2f72861643e1d31ffc3e6c374b52d33d2423':
Fix typo in SIGTTOU description.
2012-08-10 12:34:17 -07:00
Elliott Hughes
f91e2f7286
Merge "Fix typo in SIGTTOU description."
2012-08-10 12:27:06 -07:00
Elliott Hughes
01030e6388
Fix typo in SIGTTOU description.
...
Change-Id: Ie0db3e7df3e1f17b43f5645d027a90603139be2f
2012-08-10 12:23:58 -07:00
Elliott Hughes
f8b3a920a8
Revert "Revert "Switch to NetBSD's strxfrm(3).""
...
This reverts commit 8793e7c7d2
,
and fixes the build by building upstream NetBSD source as a
separate library that's then swallowed whole into libc_common.
Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 12:10:10 -07:00
Elliott Hughes
a618ea30e1
am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '4ec9e343cf445c5032d9a782d2e92b1dba713e61':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:44:29 -07:00
Elliott Hughes
4ec9e343cf
Merge "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 11:36:31 -07:00
Elliott Hughes
8793e7c7d2
Revert "Switch to NetBSD's strxfrm(3)."
...
This reverts commit be1d78b0dc
Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
2012-08-10 11:36:17 -07:00
Jeff Sharkey
b17cd156b5
am 9a477de2
: am 6ccc2c8f
: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '9a477de2f54922ba28dbc4789b12b83e64bd1474':
Add unshare() syscall.
2012-08-10 11:33:26 -07:00
Jeff Sharkey
9a477de2f5
am 6ccc2c8f
: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '6ccc2c8f435e42db3d844698f82ab6884798624a':
Add unshare() syscall.
2012-08-10 11:31:20 -07:00
Jeff Sharkey
6ccc2c8f43
Merge "Add unshare() syscall." into jb-mr1-dev
2012-08-10 11:29:53 -07:00
Elliott Hughes
3e83da435b
am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '9ad1d6f58ccbc830ce87e3ddf35708e519a8f23e':
Switch to NetBSD's strxfrm(3).
2012-08-10 11:28:40 -07:00
Elliott Hughes
9ad1d6f58c
Merge "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:23:30 -07:00
Jeff Sharkey
5467f25f82
Add unshare() syscall.
...
Bug: 6925012
Change-Id: I2530a8f6cea49eb32b60f8f9c4d86963773456ca
2012-08-10 11:17:59 -07:00
Elliott Hughes
be1d78b0dc
Switch to NetBSD's strxfrm(3).
...
There were two bugs in our implementation. Intel found one, but another
remainined, and tracking upstream is the way forward for functions where
we add no value.
Change-Id: Ida9bac0293fb2c4cbc942b1e0515ee0477c6538b
2012-08-10 11:03:02 -07:00
The Android Open Source Project
cb221a5cbe
am 1551f18a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1551f18af0c75c2b2c3ca61168fe4284b54f1a2e':
2012-08-10 08:53:33 -07:00
The Android Open Source Project
1551f18af0
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0
2012-08-10 08:51:39 -07:00
Raghu Gandham
abd10011a7
MIPS support to sigsuspend and sigwait routines
...
Change-Id: I870e798ed7eac5a8c74e5784a670f3a4f24331a9
2012-08-09 18:51:19 -07:00
Elliott Hughes
dc6d5327bb
am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit '0836a7ffb13890558fe568119b023007cce66373':
Auto-generate a complete NOTICE file.
2012-08-09 16:39:15 -07:00
Elliott Hughes
0836a7ffb1
Merge "Auto-generate a complete NOTICE file."
2012-08-09 16:25:19 -07:00
Elliott Hughes
387d4b7de9
Auto-generate a complete NOTICE file.
...
Remove the hand-collated ones, and switch to a script that pulls the
copyright headers out of every file and collects the unique ones.
Change-Id: Ied3b98b3f56241df97166c410ff81de4e0157c9d
2012-08-09 16:05:31 -07:00
Elliott Hughes
444a2bf314
am 8e1e66da
: am 31ab6ac0
: am 8cc8f7e0
: am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '8e1e66da21398b9ccd4ce68d855909e5eb53f6f0':
Remove ThirdPartyProject.prop.
2012-08-09 14:51:21 -07:00
Elliott Hughes
8e1e66da21
am 31ab6ac0
: am 8cc8f7e0
: am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '31ab6ac05ebbf29f767a15525f6f7fa2054cc8e3':
Remove ThirdPartyProject.prop.
2012-08-09 14:49:14 -07:00
Elliott Hughes
31ab6ac05e
am 8cc8f7e0
: am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '8cc8f7e0d566aaa4c4fbf9d9c8da72b268250617':
Remove ThirdPartyProject.prop.
2012-08-09 14:47:24 -07:00
Elliott Hughes
8cc8f7e0d5
am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '709bb0f79ced522e5fb145182472ee4063b85368':
Remove ThirdPartyProject.prop.
2012-08-09 14:46:00 -07:00
Elliott Hughes
709bb0f79c
Merge "Remove ThirdPartyProject.prop."
2012-08-09 14:31:27 -07:00
Elliott Hughes
df675370d7
Remove ThirdPartyProject.prop.
...
These are dead. I cleaned up external/ a long time ago, but didn't
realize there were any in the main tree.
Change-Id: I5f35b2da132558e2763164285eb38629cd68ffda
2012-08-09 14:29:23 -07:00
Elliott Hughes
f1e95d935f
am 9550a7c5
: am 3fc21198
: am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '9550a7c57c7f2ed98a5266843e1929cfd92c4a16':
Remove the last .jam file.
2012-08-09 12:15:02 -07:00
Elliott Hughes
9550a7c57c
am 3fc21198
: am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '3fc211983eb447dd4309c2f8d0e8c33ae685f02f':
Remove the last .jam file.
2012-08-09 12:13:27 -07:00
Elliott Hughes
3fc211983e
am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '531d348d6e37deb751efbefc0613934c5a80de1d':
Remove the last .jam file.
2012-08-09 12:11:08 -07:00
Elliott Hughes
531d348d6e
am a17b85d9
: Merge "Remove the last .jam file."
...
* commit 'a17b85d97b16583ba922a88346cc54976a0bfa28':
Remove the last .jam file.
2012-08-09 12:08:53 -07:00
Elliott Hughes
a17b85d97b
Merge "Remove the last .jam file."
2012-08-09 11:59:20 -07:00
Elliott Hughes
a554212992
Remove the last .jam file.
...
How did I miss this before?
Change-Id: I2e582133fc4800656fdd81104f8dfc7ee8f5b580
2012-08-09 11:54:23 -07:00
The Android Automerger
536b1daf00
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:41 -07:00
Elliott Hughes
1ab6f486de
am 0ac6d235
: am b13ad93f
: am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit '0ac6d23515cbeb8462b62be713119edb8718cd70':
MIPS support to sys/ headers
2012-08-08 17:49:39 -07:00
Elliott Hughes
a8e76ddf9e
am 1afca3f6
: am 73ac7d94
: am d2040cb2
: am f655ce7e
: Merge "Fix x86 build."
...
* commit '1afca3f69887d9c761d448ddc0c4031176351fe1':
Fix x86 build.
2012-08-08 17:49:38 -07:00
Elliott Hughes
0ac6d23515
am b13ad93f
: am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit 'b13ad93f4a452b1ec7a37e1426f664787b83836f':
MIPS support to sys/ headers
2012-08-08 17:47:30 -07:00
Elliott Hughes
1afca3f698
am 73ac7d94
: am d2040cb2
: am f655ce7e
: Merge "Fix x86 build."
...
* commit '73ac7d94b7cf627524be97da7704206b5ffd4fcf':
Fix x86 build.
2012-08-08 17:47:29 -07:00
Elliott Hughes
b13ad93f4a
am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit '3820229b46ed3012f19a32cea70b6007ad54b746':
MIPS support to sys/ headers
2012-08-08 17:44:20 -07:00
Elliott Hughes
73ac7d94b7
am d2040cb2
: am f655ce7e
: Merge "Fix x86 build."
...
* commit 'd2040cb2244bbd253951b5ff808efe67246e5154':
Fix x86 build.
2012-08-08 17:44:14 -07:00
Elliott Hughes
3820229b46
am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit 'd504eee9fa7dda59a41eb3e12ef973f32ee1169f':
MIPS support to sys/ headers
2012-08-08 16:51:01 -07:00
Elliott Hughes
d504eee9fa
Merge "MIPS support to sys/ headers"
2012-08-08 16:32:55 -07:00
Elliott Hughes
d2040cb224
am f655ce7e
: Merge "Fix x86 build."
...
* commit 'f655ce7ef3df277442ccc47f91cb919c1cd9ebd6':
Fix x86 build.
2012-08-08 16:19:25 -07:00
Elliott Hughes
f655ce7ef3
Merge "Fix x86 build."
2012-08-08 16:07:27 -07:00
Elliott Hughes
57e6d9ab48
Fix x86 build.
...
Change-Id: Ice50ca71a19f3bf26de7cfd4c02075f1e6e0823f
2012-08-08 16:06:51 -07:00
Elliott Hughes
40805076f9
am b02f100f
: am 366c0199
: am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'b02f100fa41d1905013b571fa4092857b873d78d':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:34:04 -07:00
Elliott Hughes
b02f100fa4
am 366c0199
: am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit '366c01992a73c40c1b6722bf9d51755c4a7ea83e':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:32:19 -07:00
Elliott Hughes
366c01992a
am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:30:39 -07:00