Elliott Hughes
ade1be3e6a
am 66544dd1: am 4ac83fad: Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
...
* commit '66544dd13674fc0a1d9af48816797c1c762a4382':
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
2014-07-23 16:58:39 +00:00
Elliott Hughes
66544dd136
am 4ac83fad: Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
...
* commit '4ac83fad3cdc486c00199eef9ea2a95d354839c4':
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
2014-07-23 16:50:57 +00:00
Elliott Hughes
656fde84a0
am 5cd06abd: am ea42a6ca: Merge "Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files."
...
* commit '5cd06abdcf8980b22bc7ca803ed6c4b2c06b00c5':
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
2014-07-23 16:49:25 +00:00
Elliott Hughes
5cd06abdcf
am ea42a6ca: Merge "Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files."
...
* commit 'ea42a6caea9d5cb5a92939ba0696856306b1d56b':
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
2014-07-23 16:42:30 +00:00
Elliott Hughes
4ac83fad3c
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
...
(cherry picked from commit 3758a244cf758046b40f630a11aed41e68c9cfc2)
Change-Id: I6ffb83b4a7b7746b095205c664cf025a72ead179
2014-07-23 09:39:40 -07:00
Elliott Hughes
f6c8d26680
am be0ee5a6: am 3ff6d95a: Remove the unused swab.S.
...
* commit 'be0ee5a62600b98533b0c072f61ab1470ab4a843':
Remove the unused swab.S.
2014-07-23 03:56:31 +00:00
Elliott Hughes
be0ee5a626
am 3ff6d95a: Remove the unused swab.S.
...
* commit '3ff6d95a9b26154c94b5cf130649cf99eb6a4010':
Remove the unused swab.S.
2014-07-23 03:51:55 +00:00
Elliott Hughes
3ff6d95a9b
Remove the unused swab.S.
...
(cherry picked from commit ca70453e84a88405d30f64d603f9a9b5f53f1243)
Change-Id: I4dc13de0bdeb7abb3bd47b0397546ad7d1f11d49
2014-07-22 20:43:55 -07:00
Elliott Hughes
5017fbda4e
am ad87093f: am e26ac7f7: Merge "Remove the unused swab.S."
...
* commit 'ad87093f04f567573afa3bcdbc6a5f967e86834f':
Remove the unused swab.S.
2014-07-23 03:37:56 +00:00
Elliott Hughes
ad87093f04
am e26ac7f7: Merge "Remove the unused swab.S."
...
* commit 'e26ac7f776c4011d17e7609efafa116ac4db25ff':
Remove the unused swab.S.
2014-07-23 03:33:41 +00:00
Duane Sand
439910983e
am f6ab6bfe: am 5d7775c6: [MIPS] Allow united mipsel and mips64el gcc toolchain
...
* commit 'f6ab6bfeb0ee36ac30421d203b750f80627d21ee':
[MIPS] Allow united mipsel and mips64el gcc toolchain
2014-07-23 02:53:41 +00:00
Elliott Hughes
98a685f5fd
am b5031b5d: am 79b5a396: Merge "[MIPS] Allow united mipsel and mips64el gcc toolchain"
...
* commit 'b5031b5d6b207484f2cf831d4dd46c17da055044':
[MIPS] Allow united mipsel and mips64el gcc toolchain
2014-07-23 02:50:08 +00:00
Duane Sand
f6ab6bfeb0
am 5d7775c6: [MIPS] Allow united mipsel and mips64el gcc toolchain
...
* commit '5d7775c6dfa8f9b2ae313c9493525d54a2d04b38':
[MIPS] Allow united mipsel and mips64el gcc toolchain
2014-07-23 02:48:41 +00:00
Elliott Hughes
b5031b5d6b
am 79b5a396: Merge "[MIPS] Allow united mipsel and mips64el gcc toolchain"
...
* commit '79b5a396178e798af4ba9b327b884ae014f15bb2':
[MIPS] Allow united mipsel and mips64el gcc toolchain
2014-07-23 02:44:48 +00:00
Duane Sand
5d7775c6df
[MIPS] Allow united mipsel and mips64el gcc toolchain
...
Explicitly tell 32-bit links that they are doing 32-bit links.
This is needed when using united 32-bit and 64-bit toolchains.
This is harmless when using older separate 32-only toolchains.
(cherry picked from commit f541650828f75b3dab22c9c0caab845be78b80fc)
Change-Id: I8df0ee7d36c6409458e18bea4e0e8b132edf77dc
2014-07-22 19:41:49 -07:00
Sreeram Ramachandran
3a14439b6b
am 1a1d0b7a: am 2582f02a: Cleanup: Delete dead code.
...
* commit '1a1d0b7abff01ed8d731e3590720c611a1db2daa':
Cleanup: Delete dead code.
2014-07-23 00:13:13 +00:00
Sreeram Ramachandran
1a1d0b7abf
am 2582f02a: Cleanup: Delete dead code.
...
* commit '2582f02a01cd56c56a4e6c9de4444a6ec937cc37':
Cleanup: Delete dead code.
2014-07-23 00:10:16 +00:00
Elliott Hughes
e26ac7f776
Merge "Remove the unused swab.S."
2014-07-22 21:56:40 +00:00
Elliott Hughes
ca70453e84
Remove the unused swab.S.
...
Change-Id: Id30eac5a21b649d6a039a0d7ca0496177fbfb571
2014-07-22 20:21:31 -07:00
Sreeram Ramachandran
2582f02a01
Cleanup: Delete dead code.
...
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 11:24:17 -07:00
Elliott Hughes
79b5a39617
Merge "[MIPS] Allow united mipsel and mips64el gcc toolchain"
2014-07-22 16:35:00 +00:00
Duane Sand
f541650828
[MIPS] Allow united mipsel and mips64el gcc toolchain
...
Explicitly tell 32-bit links that they are doing 32-bit links.
This is needed when using united 32-bit and 64-bit toolchains.
This is harmless when using older separate 32-only toolchains.
Change-Id: I70cbd3f5867e59b1f6f829793444242fb0894aa6
2014-07-22 14:27:48 -07:00
Elliott Hughes
ea42a6caea
Merge "Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files."
2014-07-22 16:25:43 +00:00
Elliott Hughes
3758a244cf
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
...
Change-Id: Id6fcb74292e661504d0758bfce24abdc18cb8d32
2014-07-22 21:29:00 -07:00
Elliott Hughes
3dde5101c4
am f6771114: am 6209c81d: Use upstream OpenBSD\'s arc4random.
...
* commit 'f6771114dddb8ec5802dbfdc13cc81e7c6f91d59':
Use upstream OpenBSD's arc4random.
2014-07-22 02:35:52 +00:00
Elliott Hughes
f6b20f4156
am e41d7b4e: am b7661362: Rewrite syslog(3) to use Android logging.
...
* commit 'e41d7b4e83418b73a18416f7a50a5dd842ac65b5':
Rewrite syslog(3) to use Android logging.
2014-07-22 02:35:51 +00:00
Elliott Hughes
f6771114dd
am 6209c81d: Use upstream OpenBSD\'s arc4random.
...
* commit '6209c81d40e2b4e129a28bda3259150d79d507e8':
Use upstream OpenBSD's arc4random.
2014-07-22 02:30:52 +00:00
Elliott Hughes
e41d7b4e83
am b7661362: Rewrite syslog(3) to use Android logging.
...
* commit 'b76613627d045acd3bdb7294f424f14c21584872':
Rewrite syslog(3) to use Android logging.
2014-07-22 02:30:49 +00:00
Elliott Hughes
6209c81d40
Use upstream OpenBSD's arc4random.
...
The getentropy_linux.c is lightly modified to build on Android, but we're now
completely in sync with upstream OpenBSD's arc4random implementation.
(cherry picked from commit 2b67d7dee09852789d9ac7d8972ed6cdb2c18430)
Change-Id: Icc939b5fa2fcac3e15ff93735d2d34f67e9bb149
2014-07-21 19:17:15 -07:00
Elliott Hughes
72602a4682
am 55383d57: am 4d421901: Merge "Use upstream OpenBSD\'s arc4random."
...
* commit '55383d57d4b1507391923bbd59bf063a6eca7f7e':
Use upstream OpenBSD's arc4random.
2014-07-22 02:12:22 +00:00
Elliott Hughes
55383d57d4
am 4d421901: Merge "Use upstream OpenBSD\'s arc4random."
...
* commit '4d421901e587fd1563da94baf59b015017c01b91':
Use upstream OpenBSD's arc4random.
2014-07-22 02:07:58 +00:00
Elliott Hughes
91f1b3998f
am 85287b29: am 925d388e: Merge "Rewrite syslog(3) to use Android logging."
...
* commit '85287b29eaeeefa46cac16cdc97551422f7449a2':
Rewrite syslog(3) to use Android logging.
2014-07-22 01:58:50 +00:00
Elliott Hughes
b76613627d
Rewrite syslog(3) to use Android logging.
...
Since we don't have syslogd on Android and you can't run one on a non-rooted
device, it's more useful if syslog output just goes to the regular Android
logging system.
Bug: 14292866
(cherry picked from commit 3ad8ecb64e9dd5614169232b84a93eb3b8aa32d7)
Change-Id: I3038855ca4f22532bf6d2c45d3f8028b866975f9
2014-07-21 18:55:04 -07:00
Elliott Hughes
85287b29ea
am 925d388e: Merge "Rewrite syslog(3) to use Android logging."
...
* commit '925d388e24945afb17f66d5c132f993e6a0d4fee':
Rewrite syslog(3) to use Android logging.
2014-07-22 01:54:47 +00:00
Dan Albert
3ce32b86ff
am 607458ff: am b828eaeb: Merge "There is no _MIN for unsigned types."
...
* commit '607458ffe1cf8486116f3cb23c667785a8cdc2eb':
There is no _MIN for unsigned types.
2014-07-22 00:50:55 +00:00
Dan Albert
607458ffe1
am b828eaeb: Merge "There is no _MIN for unsigned types."
...
* commit 'b828eaeb4512baba6d43a56da682bd7329079822':
There is no _MIN for unsigned types.
2014-07-22 00:43:15 +00:00
Dan Albert
b61f7f8316
am e226b640: am 1fb90a8a: Merge "Fix mbsrtowcs(3)\'s handling of len parameter."
...
* commit 'e226b64061207358f5489bc5c119e768d5761b99':
Fix mbsrtowcs(3)'s handling of len parameter.
2014-07-21 19:24:46 +00:00
Dan Albert
96a820327f
am 75fcd01a: am e9731387: Merge "__libc_fatal should print a newline to stderr."
...
* commit '75fcd01a6ecdee67f55751557ebceb0f31a73682':
__libc_fatal should print a newline to stderr.
2014-07-21 19:24:27 +00:00
Dan Albert
e226b64061
am 1fb90a8a: Merge "Fix mbsrtowcs(3)\'s handling of len parameter."
...
* commit '1fb90a8aa0086f7e4f7960a5b916b8605a9a3c96':
Fix mbsrtowcs(3)'s handling of len parameter.
2014-07-21 18:56:06 +00:00
Hans Boehm
3033608b86
am 50f2de91: am ed68221a: Define atomic_charN_t only if charN_t is supported.
...
* commit '50f2de914f24c0bb38a51ab7759698d11b38a9ad':
Define atomic_charN_t only if charN_t is supported.
2014-07-21 18:27:40 +00:00
Christopher Ferris
41370acfef
am b290796f: am b0815aea: Make sure not to construct illegal property names.
...
* commit 'b290796ff99151cd13f9d480cc186ceae4713c9f':
Make sure not to construct illegal property names.
2014-07-21 18:27:40 +00:00
Elliott Hughes
2e138c41d9
am ebb47455: am fbd00819: Merge "Clean up some misinformation around prctl." into lmp-dev
...
* commit 'ebb474553165cf72c1b3908755aeb3b690f40ad8':
Clean up some misinformation around prctl.
2014-07-21 18:27:39 +00:00
Christopher Ferris
44d1b00305
am 2affffac: am a6945179: Merge "Add gen syscalls step to instructions." into lmp-dev
...
* commit '2affffac74eac349b0981cfe8fd65743835896f5':
Add gen syscalls step to instructions.
2014-07-21 18:27:38 +00:00
Elliott Hughes
065d312a53
am 4aa12034: am 291da8d3: Remove SIOCKILLADDR from <sys/socket.h>.
...
* commit '4aa120347435481cf439e0378ef12a60b546d2a8':
Remove SIOCKILLADDR from <sys/socket.h>.
2014-07-21 18:27:38 +00:00
Elliott Hughes
a0d633c2f7
am 6f9e6124: am b5bef263: (-s ours) Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
...
* commit '6f9e612413a281d69c8d2dbbe00442d75a1f5abb':
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
2014-07-21 18:27:37 +00:00
Dan Albert
75fcd01a6e
am e9731387: Merge "__libc_fatal should print a newline to stderr."
...
* commit 'e9731387f46938dd73fcda0193460b33655400c4':
__libc_fatal should print a newline to stderr.
2014-07-21 18:23:56 +00:00
Elliott Hughes
beb24d0dd6
am 841c633f: resolved conflicts for merge of b5bef263 to lmp-dev-plus-aosp
...
* commit '841c633fa13ba8d48563fbda247e75bab3bd6f49':
resolved conflicts for merge of b5bef263 to lmp-dev-plus-aosp
2014-07-21 18:21:55 +00:00
Christopher Ferris
451b910deb
am bdfb313c: am e8bc5813: Use the mmap/munmap for allocation routines.
...
* commit 'bdfb313cf1cefd4ffaa59c6aea20a49608a73a52':
Use the mmap/munmap for allocation routines.
2014-07-21 18:21:35 +00:00
Elliott Hughes
4d421901e5
Merge "Use upstream OpenBSD's arc4random."
2014-07-21 15:45:37 +00:00
Elliott Hughes
2b67d7dee0
Use upstream OpenBSD's arc4random.
...
The getentropy_linux.c is lightly modified to build on Android, but we're now
completely in sync with upstream OpenBSD's arc4random implementation.
Change-Id: If32229fc28aba908035fb38703190d41ddcabc95
2014-07-21 14:38:16 -07:00