summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete smd tool.Elliott Hughes2015-03-162-43/+0
| | | | | | | It's basically "echo" with a redirect, and it hasn't been touched since cupcake. Could be replaced with a shell script if need be. Change-Id: I75b663ea4be3d7cd9581faa6ef3979de28e68dfb
* Merge "Document mkdir behavioural change"Elliott Hughes2015-03-151-1/+2
|\
| * Document mkdir behavioural changeJohan Redestig2015-03-151-1/+2
|/ | | | | | | Since 27164dc mkdir will update mode, owner and group even if the directory exists already Change-Id: Ic37975d118a87afded5bfade775cb3d0d3b19892
* Merge "Document the mount option string in the readme.txt"Elliott Hughes2015-03-151-2/+4
|\
| * Document the mount option string in the readme.txtNiklas Tibbling2015-03-151-2/+4
| | | | | | | | | | | | also make a distinction between flag and option. Change-Id: Ia872bc8dc98b3459f9c1e992d096c115699357af
* | Merge "Add commonly used C++ macros to libbase."Dan Albert2015-03-142-1/+189
|\ \
| * | Add commonly used C++ macros to libbase.Dan Albert2015-03-142-1/+189
| | | | | | | | | | | | Change-Id: I74f5dbfc4d99f7e78212a72540e538c1a737e224
* | | Merge "Create libbase."Dan Albert2015-03-1417-83/+213
|\ \ \ | |/ / | | / | |/ |/|
| * Create libbase.Dan Albert2015-03-1417-83/+213
|/ | | | | | | Move StringPrintf and the string based file I/O from libutils to libbase. Change-Id: I0297a6063874b9d92100e0dd5123fddfbda932fe
* Merge "Remove unused header file."Elliott Hughes2015-03-141-70/+0
|\
| * Remove unused header file.Elliott Hughes2015-03-141-70/+0
|/ | | | | | This library no longer exists. Change-Id: I5582b41b70691171b1ac5f2bffd623f2b2fc10e5
* Merge "Remove obsolete setkey."Elliott Hughes2015-03-144-29/+0
|\
| * Remove obsolete setkey.Elliott Hughes2015-03-134-29/+0
|/ | | | | | It's undocumented and unused. Change-Id: I685dc900adbc14f2e8b4eeebb1e4d111782f141d
* Merge "Switch liblog to sysv-only hash style"Dmitriy Ivanov2015-03-131-1/+1
|\
| * Switch liblog to sysv-only hash styleDmitriy Ivanov2015-03-131-1/+1
| | | | | | | | | | Bug: 19059885 Change-Id: I5519a4e19716303692d4117bc24988f21d5a829e
* | Merge "logd: report reinit"Mark Salyzyn2015-03-132-9/+23
|\ \
| * | logd: report reinitMark Salyzyn2015-03-122-9/+23
| | | | | | | | | | | | | | | Bug: 19681572 Change-Id: I343b9d108f064f87df79512a0fdf1b35513c3136
* | | Merge "Remove getsebool/setsebool from init and toolbox."Elliott Hughes2015-03-137-187/+0
|\ \ \
| * | | Remove getsebool/setsebool from init and toolbox.Stephen Smalley2015-03-137-187/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were leftovers from the SELinux boolean support that was originally merged. Since Android prohibits SELinux policy booleans, we can just drop it. Change-Id: I02f646a7d8db65e153702205b082b87a73f60d73 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "adb doesn't actually use libzipfile."Elliott Hughes2015-03-133-3/+0
|\ \ \ \
| * | | | adb doesn't actually use libzipfile.Elliott Hughes2015-03-133-3/+0
| | |_|/ | |/| | | | | | | | | | Change-Id: Ia7d22214bc8422c88edaaf9bb716d7e12e0bb381
* | | | Merge "Allocate buffers on the heap"Dmitriy Ivanov2015-03-121-9/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Allocate buffers on the heapDmitriy Ivanov2015-03-121-9/+10
| |/ / | | | | | | | | | Change-Id: I96c8a50e8987e8ea77d0766ccf3c619f60377864
* | | Merge changes I3187aa34,Iadac58e6Mark Salyzyn2015-03-126-19/+149
|\ \ \ | | |/ | |/| | | | | | | | | | * changes: init.rc: logd --reinit on changes to persistent properties logd: add reinit command
| * | init.rc: logd --reinit on changes to persistent propertiesMark Salyzyn2015-03-121-0/+6
| | | | | | | | | | | | | | | Bug: 19681572 Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
| * | logd: add reinit commandMark Salyzyn2015-03-125-19/+143
| |/ | | | | | | | | | | | | | | | | | | - respond to SIGHUP - respond to logd command "reinit" - respond to logd --reinit - reopens files on /data, eg: re-read of persistent properties Bug: 19681572 Change-Id: Iadac58e6653f027cb7355497bd675eef376ce0a8
* | Merge "logcat: test: logcat.logrotate fails"Mark Salyzyn2015-03-121-2/+4
|\ \
| * | logcat: test: logcat.logrotate failsMark Salyzyn2015-03-121-2/+4
| | | | | | | | | | | | | | | | | | | | | Test did not handle all possible multiples of block sizes. Bug: 19604106 Change-Id: I693358be9598926389631baf21c5883e0f2fd735
* | | Merge "logcat: fortify help on filterspec"Mark Salyzyn2015-03-121-11/+9
|\ \ \ | |_|/ |/| |
| * | logcat: fortify help on filterspecMark Salyzyn2015-03-091-11/+9
| | | | | | | | | | | | | | | Bug: 19620794 Change-Id: I572ffb62d39d884d5102b0846a95b1a8216f3d41
* | | Merge "builtins: remove setenforce command"Nick Kralevich2015-03-124-16/+0
|\ \ \
| * | | builtins: remove setenforce commandNick Kralevich2015-03-114-16/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | Adding "setenforce 0" to init.rc isn't a supported way to turn off SELinux, and doesn't work with AOSP SELinux policy. Remove the code from init. Change-Id: If8c8149560789c9a7ba518a0a100e6033bb68898
* | | Merge "Fix a printf format string (caught by clang but not GCC)."Elliott Hughes2015-03-111-1/+1
|\ \ \
| * | | Fix a printf format string (caught by clang but not GCC).Elliott Hughes2015-03-111-1/+1
|/ / / | | | | | | | | | Change-Id: I665756615eef74b05ef92f5865d910f29ead0695
* | | Merge "Implement exec."Elliott Hughes2015-03-1110-173/+391
|\ \ \
| * | | Implement exec.Elliott Hughes2015-02-2510-173/+391
| | | | | | | | | | | | | | | | Change-Id: I20329bc9b378479d745b498d6a00eca0872cd5ab
* | | | Merge "Do not call libcutils property_set in init through libfs_mgr"Sami Tolvanen2015-03-111-27/+1
|\ \ \ \
| * | | | Do not call libcutils property_set in init through libfs_mgrSami Tolvanen2015-03-051-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both init and libcutils define a property_set function. The init version sets the property directly while libcutils simply calls __system_property_set, which sends a message to init to set the property. Since libfs_mgr is statically linked to libcutils, any calls to property_set end up sending a message to init and waiting for a response. When libfs_mgr is further statically linked to init, this leads to init sending a message to itself when property_set is called in fs_mgr. Because send_prop_msg in bionic only waits for a response for 250ms, this does not cause a deadlock. However, using libcutils to set a property in the init process is hardly a good idea. This change removes the property_set call from fs_mgr_verity.c. If this property is required later, it should be set elsewhere. Change-Id: I6a28cccb1ccce960841af20a4b20c32d424b5524
* | | | | Merge "libadf: enable -Werror"Greg Hackmann2015-03-113-1/+3
|\ \ \ \ \
| * | | | | libadf: enable -WerrorGreg Hackmann2015-03-103-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19606869 Change-Id: If2ea55732e71e8288641b6b34d229b367fd3fb3b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | Merge "libadf: tests: fix signed/unsigned comparison warnings"Greg Hackmann2015-03-101-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | libadf: tests: fix signed/unsigned comparison warningsGreg Hackmann2015-03-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19606869 Change-Id: I29cfa363b6640cc13973c1023d2f4ea1a97e3af2 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | am b27bd948: Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b27bd94896dcfd94940e65a2438dc6a337c03038': Generate gnu hash for arm only
| * | | | | Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
| |\ \ \ \ \
| | * | | | | Generate gnu hash for arm onlyGoran Jakovljevic2015-03-101-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mips build failure caused by: https://android-review.googlesource.com/#/c/139580/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I757fef1d47663da3e414f5771dfc580ea7aa3732
* | | | | | am ad571cdd: Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ad571cdd2ce8c85f92ed87e021c94569b24fc7c1': Add backtrace support for mips64.
| * | | | | Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
| |\ \ \ \ \
| | * | | | | Add backtrace support for mips64.Douglas Leung2015-03-094-3/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12ea2fcbe6780bb596f51988eae1ceafcec858df
* | | | | | | am ed5b81c9: Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686': Fix LP32 build.
| * | | | | | Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
| |\ \ \ \ \ \