summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am e494c513: Merge "Lose sync to toybox."Elliott Hughes2014-11-252-67/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b': Lose sync to toybox.
| * | | | | Merge "Lose sync to toybox."Elliott Hughes2014-11-242-67/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Lose sync to toybox.Elliott Hughes2014-11-242-67/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I36c98135bb4ab1e2ca7137b7a83782fce5ac683a
* | | | | am 9f693b8f: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks"Ying Wang2014-11-251-16/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7': Use LOCAL_POST_LINK_CMD to install toolbox symlinks
| * | | | 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
* | | | | | am f3c8eb83: Merge "Remove dead tools."Elliott Hughes2014-11-257-756/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f3c8eb838db02a5fc215e178e4eb319831894d48': Remove dead tools.
| * | | | | 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
* | | | | | am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-253-506/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8eb770d37cd9470630fdbe496f22b7a04549fef7': Remove long-dead readtty.
| * | | | | Merge "Remove long-dead readtty."Elliott Hughes2014-11-243-506/+0
| |\ \ \ \ \
| | * | | | | Remove long-dead readtty.Elliott Hughes2014-11-243-506/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
* | | | | | | resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aospElliott Hughes2014-11-254-164/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
| * | | | | | 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
* | | | | | | am e3d9a675: Merge "Remove unused variable"Chih-hung Hsieh2014-11-251-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e3d9a67505236d502e6fbc7a1e278103ab2f7569': Remove unused variable
| * | | | | | 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>
* | | | | | am a4b846f0: Merge "Libnetutils: Remove unused functions & variables"Andreas Gampe2014-11-254-12/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a4b846f0d3a679b24f9cd92da9705ae0dcd12995': Libnetutils: Remove unused functions & variables
| * | | | | Merge "Libnetutils: Remove unused functions & variables"Andreas Gampe2014-11-244-12/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Libnetutils: Remove unused functions & variablesAndreas Gampe2014-11-244-12/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: I40a78d5a532dc32b53beb1cfc1b7645bab8add16
* | | | | am 1fc78d3d: Merge "Liblog: Remove unused function"Andreas Gampe2014-11-251-9/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1fc78d3d0bc0676e58483afcb6b5035e598b6c31': Liblog: Remove unused function
| * | | | Merge "Liblog: Remove unused function"Andreas Gampe2014-11-241-9/+0
| |\ \ \ \
| | * | | | Liblog: Remove unused functionAndreas Gampe2014-11-241-9/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused function. Change-Id: I8c28c4bbbadaea6a5b32483e9e220794967bdd4e
* | | | | am cb321921: Merge "fastboot: add parameter for unbuffered stderr/stdout"Elliott Hughes2014-11-251-1/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'cb321921fe04f6ccaeb56c4bf3e8965ee4764738': fastboot: add parameter for unbuffered stderr/stdout
| * | | | Merge "fastboot: add parameter for unbuffered stderr/stdout"Elliott Hughes2014-11-241-1/+9
| |\ \ \ \
| | * | | | fastboot: add parameter for unbuffered stderr/stdoutFlorian Bäuerle2014-11-241-1/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for writing Windows GUIs that want to parse the output of fastboot before it exits. Change-Id: Ic0171fe379fc4db7b65b1501e5f2e771ac7c62c4 Signed-off-by: Florian Bäuerle <florian.bae@gmail.com>
* | | | | am 1f6be2b6: Merge "Libziparchive: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1f6be2b6355d26967993011bb92afb0754b90655': Libziparchive: Remove unused variable
| * | | | Merge "Libziparchive: Remove unused variable"Andreas Gampe2014-11-241-1/+0
| |\ \ \ \
| | * | | | Libziparchive: Remove unused variableAndreas Gampe2014-11-241-1/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variable. Change-Id: Icc33cf5d0a5fe9a77c277b100de01b70164cc351
* | | | | am 374de72b: Merge "Libcutils: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '374de72bbc218198e6a5f09ae4da853d02199b5c': Libcutils: Remove unused variable
| * | | | Merge "Libcutils: Remove unused variable"Andreas Gampe2014-11-241-1/+0
| |\ \ \ \
| | * | | | Libcutils: Remove unused variableAndreas Gampe2014-11-241-1/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variable. Change-Id: Iaf6dd7b84ee4ef4734a48b37a4d0ca8287ca5fb5
* | | | | am f96c7bd4: Merge "Libutils: Comment out unused constants"Andreas Gampe2014-11-251-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f96c7bd4b0c9c6e5770cda034b696212c9c6336d': Libutils: Comment out unused constants
| * | | | Merge "Libutils: Comment out unused constants"Andreas Gampe2014-11-241-2/+3
| |\ \ \ \
| | * | | | Libutils: Comment out unused constantsAndreas Gampe2014-11-241-2/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, "remove" unused variables. Change-Id: Ic96f066981cd96ca16af81ee3fdbc972507e8c81
* | | | | am a5a4e9e0: sdcard: mount sdcard with the noexec optionDaisuke Okitsu2014-11-250-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'a5a4e9e0cad383f0c14dbe92a60b7d8150ae6b1f': sdcard: mount sdcard with the noexec option
| * | | | sdcard: mount sdcard with the noexec optionDaisuke Okitsu2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vold mounts the sdcard with noexec, but the fuse deamon mounts with exec, so it is still possible to execute binaries: /dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime, user_id=1023,group_id=1023,default_permissions,allow_other 0 0 /dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync, nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007, dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1, shortname=mixed,utf8,errors=remount-ro 0 0 With this change both vold and fuse mounts with noexec. (cherry picked from commit f777d6694eecf6e61d9859df2090199863050017) Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
* | | | | am 744c4986: Merge "sdcard: mount sdcard with the noexec option"Elliott Hughes2014-11-251-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '744c4986a1cdbf5c2cbe71d149f1545052e4f33f': sdcard: mount sdcard with the noexec option
| * | | | Merge "sdcard: mount sdcard with the noexec option"Elliott Hughes2014-11-241-1/+1
| |\ \ \ \
| | * | | | sdcard: mount sdcard with the noexec optionDaisuke Okitsu2014-11-241-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vold mounts the sdcard with noexec, but the fuse deamon mounts with exec, so it is still possible to execute binaries: /dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime, user_id=1023,group_id=1023,default_permissions,allow_other 0 0 /dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync, nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007, dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1, shortname=mixed,utf8,errors=remount-ro 0 0 With this change both vold and fuse mounts with noexec. Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
* | | | | am 8eff1df1: Merge "libadf: add tests for various failure modes"Greg Hackmann2014-11-241-14/+99
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8eff1df1cb3da41e88fd3a99dffcf5b3406d46a2': libadf: add tests for various failure modes
| * | | | Merge "libadf: add tests for various failure modes"Greg Hackmann2014-11-241-14/+99
| |\ \ \ \
| | * | | | libadf: add tests for various failure modesGreg Hackmann2014-05-071-14/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b13e84c6663cb73af2829bedd3514119a01764c Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | am 7e2e3258: Merge "libadf: add tests"Greg Hackmann2014-11-242-0/+279
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '7e2e32584530ddd9d0b5846bef9df3f36ee8a55b': libadf: add tests
| * | | | | Merge "libadf: add tests"Greg Hackmann2014-11-242-0/+279
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | libadf: add testsGreg Hackmann2014-05-072-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I353099bf194d4d566c720e44190ad34f407f3dce Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | am 7f187c5f: Merge "Lose clear, false, and true to toybox."Elliott Hughes2014-11-234-150/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7f187c5f95d6bf0514e71e0e074768bd5395d45f': Lose clear, false, and true to toybox.
| * | | | Merge "Lose clear, false, and true to toybox."Elliott Hughes2014-11-234-150/+0
| |\ \ \ \
| | * | | | Lose clear, false, and true to toybox.Elliott Hughes2014-11-224-150/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I125ea881e61b834b188d9a5411f3b6efe59b9bad
generated by cgit v1.1 at 2024-08-30 05:13:54 +0000