summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "libpixelflinger should #define __ARM_HAVE_NEON."Elliott Hughes2014-12-041-0/+1
|\
| * libpixelflinger should #define __ARM_HAVE_NEON.Elliott Hughes2014-12-031-0/+1
|/ | | | | Bug: 18556103 Change-Id: Ife07cf63948f1c248bcde5685cdb6d89c373d988
* Merge "Fix deadlocks."Elliott Hughes2014-12-031-3/+3
|\
| * Fix deadlocks.Bao Haojun2014-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Close pipe fds[1] as soon as possible. Otherwise it may block when reading from fds[0] even though the child process has exited early and closed its copy of fds[1]. 2. Waitpid after pipe is closed. Otherwise the screencap child process may block while writing fds[1], because the fds[0] is not closed yet. If we close fds[0] first, then the screencap child process will die because of SIGPIPE, and waitpid will return correctly. Change-Id: I433c95a5ba2eb3045727fc39a49fd9557fb1a1d1 Signed-off-by: Bao Haojun <baohaojun@gmail.com>
* | Merge "Fix build."Dan Albert2014-11-281-10/+11
|\ \
| * | Fix build.Dan Albert2014-11-281-10/+11
|/ / | | | | | | | | | | More UD literals that weren't caught by hammerhead... Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
* | Merge "Lose readlink to toybox."Elliott Hughes2014-11-272-96/+0
|\ \
| * | Lose readlink to toybox.Elliott Hughes2014-11-262-96/+0
| | | | | | | | | | | | Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
* | | Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-261-1/+1
|\ \ \
| * | | Clarify the strcmp() with the empty string.Stephen Hines2014-11-261-1/+1
|/ / / | | | | | | | | | Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
* | | Merge "Fix incorrect path name check."Stephen Hines2014-11-261-1/+1
|\ \ \ | |/ / |/| |
| * | Fix incorrect path name check.Stephen Hines2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was caught by clang 3.6's -Wpointer-bool-conversion. The device_path field is a char[256], and thus never NULL. The intention for this code was to check whether or not there is a named path at all. Checking whether this is an empty string matches the original intent. Change-Id: I5ccedc03167e6a457e472089de26130aff7f96e3
* | | Merge "Lose dmesg to toybox."Elliott Hughes2014-11-262-59/+0
|\ \ \
| * | | Lose dmesg to toybox.Elliott Hughes2014-11-252-59/+0
| | | | | | | | | | | | | | | | Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
* | | | Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Lose nohup to toybox.Elliott Hughes2014-11-252-27/+0
|/ / / | | | | | | | | | Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
* | | Merge "Only Windows doesn't have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
|\ \ \
| * | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-252-7/+10
|/ / / | | | | | | | | | | | | | | | | | | This should probably be in libcutils instead, so code that needs to care about Windows can use readv/writev. Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
* | | Merge "Only Win32 doesn't have writev."Elliott Hughes2014-11-251-2/+2
|\ \ \
| * | | Only Win32 doesn't have writev.Elliott Hughes2014-11-251-2/+2
| | | | | | | | | | | | | | | | Change-Id: I9b5328cea3c88a75135dcb0711cbb5471e8fa388
* | | | Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
|\ \ \ \
| * | | | Libion: Remove unused variablesAndreas Gampe2014-11-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Fix missing close of file descriptors. Explicitly exit after a fork. Change-Id: I76affbc8647c3a760ed3cacc7f3ada3f59e283b1
* | | | | Merge "Init: Remove unused variables"Andreas Gampe2014-11-256-30/+9
|\ \ \ \ \
| * | | | | Init: Remove unused variablesAndreas Gampe2014-11-246-30/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Use a #define instead of static variable in a header file. Change-Id: Id47bf38e51644b61a9f3ac1893a16553695f1aac
* | | | | Merge "Lmkd: Fix unused variables"Andreas Gampe2014-11-251-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Lmkd: Fix unused variablesAndreas Gampe2014-11-241-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Change-Id: I841192e92585814b8691d544cc48433b2ca1b3d3
* | | | Merge "Libsuspend: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \
| * | | | Libsuspend: Remove unused variableAndreas Gampe2014-11-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variable. Change-Id: I34bd33fd24b02ee58b64029146c253c61651d45f
* | | | | Merge "Healthd: Remove unused variables"Andreas Gampe2014-11-253-8/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Healthd: Remove unused variablesAndreas Gampe2014-11-243-8/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variables. Change-Id: Ifc5884518bfdb744ea9823b98db544dbe59c20d2
* | | | Merge "Lose mkswap, swapoff, and swapon to toybox."Elliott Hughes2014-11-254-180/+0
|\ \ \ \
| * | | | Lose mkswap, swapoff, and swapon to toybox.Elliott Hughes2014-11-244-180/+0
|/ / / / | | | | | | | | | | | | Change-Id: Iedb371ad0f1f74822b3ff4bc1b7b1f9e6ecd300d
* | | | Merge "Lose printenv to toybox."Elliott Hughes2014-11-242-110/+0
|\ \ \ \
| * | | | Lose printenv to toybox.Elliott Hughes2014-11-242-110/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
* | | | | Merge "Use LOCAL_POST_INSTALL_CMD to simplify symlink creation."Ying Wang2014-11-241-20/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use LOCAL_POST_INSTALL_CMD to simplify symlink creation.Ying Wang2014-11-241-20/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I67ad7248c26561d394e66901e90ef5814ec69fb3
* | | | | Merge "Lose sleep to toybox."Elliott Hughes2014-11-242-167/+0
|\ \ \ \ \
| * | | | | Lose sleep to toybox.Elliott Hughes2014-11-242-167/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | No pun intended. Change-Id: Ic1d9c8fa9719a7749b4eeaeac20df313600c0b88
* | | | | Merge "Lose sync to toybox."Elliott Hughes2014-11-242-67/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Lose sync to toybox.Elliott Hughes2014-11-242-67/+0
|/ / / / | | | | | | | | | | | | Change-Id: I36c98135bb4ab1e2ca7137b7a83782fce5ac683a
* | | | Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"Ying Wang2014-11-241-16/+3
|\ \ \ \
| * | | | Use LOCAL_POST_LINK_CMD to install toolbox symlinksYing Wang2014-11-241-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's simpler; Also whenever toolbox is updated the symlinks get recreated. Change-Id: I03fb61a5e0f14fd4ed23680dd6db87eed5b46787
* | | | | Merge "Remove dead tools."Elliott Hughes2014-11-247-756/+0
|\ \ \ \ \
| * | | | | Remove dead tools.Elliott Hughes2014-11-247-756/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | These have all been obsolete since we first moved to git! Change-Id: Ie5bfc1b30000930ef6a604b4313ff7af1b7c4573
* | | | | Merge "Remove long-dead readtty."Elliott Hughes2014-11-243-506/+0
|\ \ \ \ \
| * | | | | Remove long-dead readtty.Elliott Hughes2014-11-243-506/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
* | | | | | Merge "Lose insmod/lsmod/rmmod to toybox."Elliott Hughes2014-11-244-163/+0
|\ \ \ \ \ \
| * | | | | | Lose insmod/lsmod/rmmod to toybox.Elliott Hughes2014-11-244-163/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia654cdca14a4fda958a406f5e6ccd0919ce88a8f
* | | | | | Merge "Remove unused variable"Chih-hung Hsieh2014-11-241-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove unused variableBernhard Rosenkränzer2014-11-241-1/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifba91dd93a9c8170f8837c413756554e117be894 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>