Elliott Hughes
a03656d884
resolved conflicts for merge of 809965cc
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
2014-11-27 11:31:06 -08:00
Elliott Hughes
809965cc36
Merge "Lose readlink to toybox."
2014-11-27 19:06:18 +00:00
Stephen Hines
fafbd329cb
am ba1552bd
: Merge "Clarify the strcmp() with the empty string."
...
* commit 'ba1552bd2438a8a47779ed3d05d5ce15bfb5741c':
Clarify the strcmp() with the empty string.
2014-11-27 13:54:31 +00:00
Stephen Hines
8d49c8b0bf
am f66486ef
: Merge "Fix incorrect path name check."
...
* commit 'f66486ef09bfc53da65ca6b4137c47d583f31356':
Fix incorrect path name check.
2014-11-27 13:54:24 +00:00
Elliott Hughes
330d892782
am b553a18a
: Merge "Lose dmesg to toybox."
...
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
Lose dmesg to toybox.
2014-11-27 12:01:22 +00:00
Elliott Hughes
0085d948f2
Lose readlink to toybox.
...
Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
2014-11-26 15:19:47 -08:00
Stephen Hines
ba1552bd24
Merge "Clarify the strcmp() with the empty string."
2014-11-26 22:58:02 +00:00
Stephen Hines
04f895314d
Clarify the strcmp() with the empty string.
...
Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
2014-11-26 14:54:43 -08:00
Stephen Hines
f66486ef09
Merge "Fix incorrect path name check."
2014-11-26 22:32:23 +00:00
Stephen Hines
60f21a7f61
Fix incorrect path name check.
...
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
2014-11-26 14:30:01 -08:00
Elliott Hughes
b553a18a02
Merge "Lose dmesg to toybox."
2014-11-26 19:37:30 +00:00
Eric Laurent
be7bb9004c
am 47f52f24
: audio: new stream types
...
* commit '47f52f247d6d895878b831de448f19b98225515d':
audio: new stream types
2014-11-26 12:01:50 +00:00
Elliott Hughes
a7ec5f1067
am 50ac7725
: Merge "Lose nohup to toybox."
...
* commit '50ac7725a5f1c195989888277341f22ab54f979b':
Lose nohup to toybox.
2014-11-26 02:03:41 +00:00
Elliott Hughes
50ac7725a5
Merge "Lose nohup to toybox."
2014-11-26 01:09:43 +00:00
Elliott Hughes
402f7e97d5
Lose nohup to toybox.
...
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
2014-11-25 16:58:53 -08:00
Elliott Hughes
8e8cd0cf7a
Lose dmesg to toybox.
...
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
2014-11-25 16:23:15 -08:00
Elliott Hughes
bbd3b7edd7
am c0ac9313
: Merge "Only Windows doesn\'t have <sys/uio.h>."
...
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
Only Windows doesn't have <sys/uio.h>.
2014-11-25 21:55:37 +00:00
Elliott Hughes
c0ac9313e9
Merge "Only Windows doesn't have <sys/uio.h>."
2014-11-25 21:48:30 +00:00
Elliott Hughes
111e3d3d9c
Only Windows doesn't have <sys/uio.h>.
...
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.
Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
2014-11-25 13:27:43 -08:00
Elliott Hughes
f11758bb58
am 9c7e5c7c
: Merge "Only Win32 doesn\'t have writev."
...
* commit '9c7e5c7c33607fce4c91e22dcf38237256450b9a':
Only Win32 doesn't have writev.
2014-11-25 19:58:38 +00:00
Andreas Gampe
fcb2f0abe0
am 0b7e6516
: Merge "Libion: Remove unused variables"
...
* commit '0b7e651615b9b01b9f3f94b6fb1dcfbbbd02c72b':
Libion: Remove unused variables
2014-11-25 19:58:36 +00:00
Andreas Gampe
45f2b924b6
am 705accc2
: Merge "Init: Remove unused variables"
...
* commit '705accc2a3e3ab29308454212a6029821426ef4e':
Init: Remove unused variables
2014-11-25 19:58:27 +00:00
Andreas Gampe
d56b3ad7b9
am bac1dfa8
: Merge "Lmkd: Fix unused variables"
...
* commit 'bac1dfa8c09824e1adb22e90e9d3cf617a81ff96':
Lmkd: Fix unused variables
2014-11-25 19:58:03 +00:00
Andreas Gampe
01334e5241
am 1690b49e
: Merge "Libsuspend: Remove unused variable"
...
* commit '1690b49e631904759737176b4bb285d446655f5d':
Libsuspend: Remove unused variable
2014-11-25 19:57:59 +00:00
Andreas Gampe
38c3386a6c
resolved conflicts for merge of 03be4928
to lmp-mr1-dev-plus-aosp
...
Change-Id: I7c72ed2c54ceae19c9dfe8b2e1707f869faad110
2014-11-25 11:45:46 -08:00
Elliott Hughes
8e76610cfc
am 077ff309
: Merge "Lose mkswap, swapoff, and swapon to toybox."
...
* commit '077ff30954275e635c5faa8b75afcd0a44a78dcc':
Lose mkswap, swapoff, and swapon to toybox.
2014-11-25 19:03:59 +00:00
Elliott Hughes
4d7a262c63
am 75afd633
: Merge "Lose printenv to toybox."
...
* commit '75afd63340b2a19ff85e5a577a8a0bdd1ca46d26':
Lose printenv to toybox.
2014-11-25 19:03:43 +00:00
Ying Wang
406f00a87f
am 8d698179
: Merge "Use LOCAL_POST_INSTALL_CMD to simplify symlink creation."
...
* commit '8d698179404658b4a037c93303b2e833932d6ff9':
Use LOCAL_POST_INSTALL_CMD to simplify symlink creation.
2014-11-25 19:03:42 +00:00
Elliott Hughes
45f296ec48
am bcece29c
: Merge "Lose sleep to toybox."
...
* commit 'bcece29c4438c6b92c973d30bc8a46331f16369f':
Lose sleep to toybox.
2014-11-25 19:03:35 +00:00
Elliott Hughes
f2f0b0fa69
am e494c513
: Merge "Lose sync to toybox."
...
* commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b':
Lose sync to toybox.
2014-11-25 19:03:25 +00:00
Ying Wang
b14bc39b36
am 9f693b8f
: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"
...
* commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7':
Use LOCAL_POST_LINK_CMD to install toolbox symlinks
2014-11-25 19:03:21 +00:00
Elliott Hughes
59acfee63f
am f3c8eb83
: Merge "Remove dead tools."
...
* commit 'f3c8eb838db02a5fc215e178e4eb319831894d48':
Remove dead tools.
2014-11-25 19:03:20 +00:00
Elliott Hughes
a0959e90f5
am 8eb770d3
: Merge "Remove long-dead readtty."
...
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
Remove long-dead readtty.
2014-11-25 19:03:12 +00:00
Elliott Hughes
0c0ab6bb06
resolved conflicts for merge of db38d10a
to lmp-mr1-dev-plus-aosp
...
Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
2014-11-25 11:00:41 -08:00
Chih-hung Hsieh
96fb5d2038
am e3d9a675
: Merge "Remove unused variable"
...
* commit 'e3d9a67505236d502e6fbc7a1e278103ab2f7569':
Remove unused variable
2014-11-25 18:52:14 +00:00
Andreas Gampe
c86b167153
am a4b846f0
: Merge "Libnetutils: Remove unused functions & variables"
...
* commit 'a4b846f0d3a679b24f9cd92da9705ae0dcd12995':
Libnetutils: Remove unused functions & variables
2014-11-25 18:52:10 +00:00
Andreas Gampe
4d47f0fcf1
am 1fc78d3d
: Merge "Liblog: Remove unused function"
...
* commit '1fc78d3d0bc0676e58483afcb6b5035e598b6c31':
Liblog: Remove unused function
2014-11-25 18:52:05 +00:00
Elliott Hughes
87fdfc718e
am cb321921
: Merge "fastboot: add parameter for unbuffered stderr/stdout"
...
* commit 'cb321921fe04f6ccaeb56c4bf3e8965ee4764738':
fastboot: add parameter for unbuffered stderr/stdout
2014-11-25 18:52:01 +00:00
Andreas Gampe
276968f24c
am 1f6be2b6
: Merge "Libziparchive: Remove unused variable"
...
* commit '1f6be2b6355d26967993011bb92afb0754b90655':
Libziparchive: Remove unused variable
2014-11-25 18:51:53 +00:00
Andreas Gampe
422ced07e5
am 374de72b
: Merge "Libcutils: Remove unused variable"
...
* commit '374de72bbc218198e6a5f09ae4da853d02199b5c':
Libcutils: Remove unused variable
2014-11-25 18:51:52 +00:00
Andreas Gampe
022a6c54b4
am f96c7bd4
: Merge "Libutils: Comment out unused constants"
...
* commit 'f96c7bd4b0c9c6e5770cda034b696212c9c6336d':
Libutils: Comment out unused constants
2014-11-25 18:51:48 +00:00
Elliott Hughes
9c7e5c7c33
Merge "Only Win32 doesn't have writev."
2014-11-25 18:34:36 +00:00
Andreas Gampe
0b7e651615
Merge "Libion: Remove unused variables"
2014-11-25 18:28:15 +00:00
Elliott Hughes
2a5fecb3cd
Only Win32 doesn't have writev.
...
Change-Id: I9b5328cea3c88a75135dcb0711cbb5471e8fa388
2014-11-25 10:25:42 -08:00
Andreas Gampe
f0a54c17d8
Libion: Remove unused variables
...
For build-system CFLAGS clean-up, fix unused variables.
Fix missing close of file descriptors. Explicitly exit after a fork.
Change-Id: I76affbc8647c3a760ed3cacc7f3ada3f59e283b1
2014-11-25 10:16:06 -08:00
Andreas Gampe
705accc2a3
Merge "Init: Remove unused variables"
2014-11-25 17:50:01 +00:00
Daisuke Okitsu
59ad2fc312
am a5a4e9e0
: sdcard: mount sdcard with the noexec option
...
* commit 'a5a4e9e0cad383f0c14dbe92a60b7d8150ae6b1f':
sdcard: mount sdcard with the noexec option
2014-11-25 17:37:55 +00:00
Elliott Hughes
d6dc983078
am 744c4986
: Merge "sdcard: mount sdcard with the noexec option"
...
* commit '744c4986a1cdbf5c2cbe71d149f1545052e4f33f':
sdcard: mount sdcard with the noexec option
2014-11-25 12:59:15 +00:00
Andreas Gampe
bac1dfa8c0
Merge "Lmkd: Fix unused variables"
2014-11-25 04:38:33 +00:00
Andreas Gampe
c165b01a8b
Lmkd: Fix unused variables
...
For build-system CFLAGS clean-up, fix unused variables.
Change-Id: I841192e92585814b8691d544cc48433b2ca1b3d3
2014-11-24 20:32:42 -08:00