summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* logd: Remove $(KERNEL_HEADERS) include.Martijn Coenen2014-02-271-2/+0
| | | | | | | | | Points to wrong kernel-headers dir in multi-arch builds. (cherry picked from commit 920a5629ff91ee0f5decaaf4f16a8fb3af752496) Change-Id: I5055bf5cd80119a34f0a6b0872ffb0a422a06baf
* Merge "Enable libunwind for mips."Christopher Ferris2014-02-261-1/+1
|\
| * Enable libunwind for mips.Christopher Ferris2014-02-261-1/+1
| | | | | | | | Change-Id: Ib1d7bea0cb7ac09a9e15c7f429ecfd944649fc87
* | Merge "Apply restorecon_recursive to all of /data."Nick Kralevich2014-02-261-8/+3
|\ \
| * | Apply restorecon_recursive to all of /data.Stephen Smalley2014-02-061-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the following prior changes: I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 I698b1b2c3f00f31fbb2015edf23d33b51aa5bba1 I8dd915d9bb80067339621b905ea2b4ea0fa8d71e it should now be safe (will correctly label all files) and reasonably performant (will skip processing unless file_contexts has changed since the last call) to call restorecon_recursive /data from init.rc. The call is placed after the setprop selinux.policy_reload 1 so that we use any policy update under /data/security if present. Change-Id: Ib8d9751a47c8e0238cf499fcec61898937945d9d Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | Merge changes Id25cdef0,I80685cdc,I929dddc7Mark Salyzyn2014-02-266-16/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: logd: Add SCHED_BATCH to reduce priority logd: Adjust to match defacto coding style logd: prune more aggressively when over the top
| * | | logd: Add SCHED_BATCH to reduce priorityMark Salyzyn2014-02-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 85620a1bfff1824687fd1cb14c8e1a9b2683c061) Change-Id: Id25cdef0dd7f8c5e154a0da2db2dd0554849babc
| * | | logd: Adjust to match defacto coding styleMark Salyzyn2014-02-265-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c46f77bd2ad01f3a695416c4cf22d6a9738bb7b8) Change-Id: I80685cdc7116e10c5a5a77abe856fd96804f9117
| * | | logd: prune more aggressively when over the topMark Salyzyn2014-02-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 63c15d50615a4c9e9ad25f601ef9dcb1161d8990) Change-Id: I929dddc7da048c032fb791c7af23f215f8856bf3
* | | | Merge "logd: initial checkin."Mark Salyzyn2014-02-2622-8/+1555
|\ \ \ \ | |/ / /
| * | | logd: initial checkin.Mark Salyzyn2014-02-2622-8/+1555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create a new userspace log daemon for handling logging messages. Original-Change-Id: I75267df16359684490121e6c31cca48614d79856 Signed-off-by: Nick Kralevich <nnk@google.com> * Merge conflicts * rename new syslog daemon to logd to prevent confusion with bionic syslog * replace racy getGroups call with KISS call to client->getGid() * Timestamps are filed at logging source * insert entries into list in timestamp order * Added LogTimeEntry tail filtration handling * Added region locking around LogWriter list * separate threads for each writer * /dev/socket/logd* permissions Signed-off-by: Mark Salyzyn <salyzyn@google.com> (cherry picked from commit 3e76e0a49760c4970b7cda6153e51026af98e4f3) Author: Nick Kralevich <nnk@google.com> Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
* | | | Merge "logcat: test: add clear and blocking check"Mark Salyzyn2014-02-261-9/+95
|\ \ \ \ | |/ / /
| * | | logcat: test: add clear and blocking checkMark Salyzyn2014-02-261-9/+95
| | |/ | |/| | | | | | | | | | | | | (cherry picked from commit 1beb2ab6f6f7cec157b25a2e728c6de8c6be58c4) Change-Id: I243b1338c4a5935a297a0519c03697fd828e47e6
* | | Merge "Fix undefined args access for x86_64."Elliott Hughes2014-02-261-2/+11
|\ \ \
| * | | Fix undefined args access for x86_64.Fengwei Yin2014-02-271-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From libc manual for vsnprintf: The functions vprintf(), vfprintf(), vsprintf(), vsnprintf() are equivalent to the functions printf(), fprintf(), sprintf(), snprintf(), respectively, except that they are called with a va_list instead of a variable number of arguments. These functions do not call the va_end macro. Because they invoke the va_arg macro, the value of ap is undefined after the call. We need to allocate/end new va_list for each vsnprintf. Change-Id: I66ec058033be1cb918e7b2bc84ca546800da226b Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
* | | Merge "libcutils: Socket type might contain bitwise OR flags"Elliott Hughes2014-02-261-1/+3
|\ \ \ | |/ / |/| |
| * | libcutils: Socket type might contain bitwise OR flagsPaul Kocialkowski2014-02-261-1/+3
|/ / | | | | | | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Change-Id: Ia5c8f136793a989fc1d71c61292afe4e5cf169fa
* | Merge "fs_mgr: Don't run e2fsck inside SDK system images."David 'Digit' Turner2014-02-251-7/+16
|\ \
| * | fs_mgr: Don't run e2fsck inside SDK system images.David 'Digit' Turner2014-02-241-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These images do not have GPL-ed binaries like /system/bin/e2fsck so avoid running the program when we detect that we're running inside one of them. Note that this does not affect other emulator-based build products (e..g full-eng instead of sdk-eng), which do have the binaries. BUG=13057123 Change-Id: Ia42f1d02a3845fbf4b2f9d95818f35d760711a12
* | | Merge "Remove an unused #include of <asm/page.h>."Elliott Hughes2014-02-251-1/+0
|\ \ \
| * | | Remove an unused #include of <asm/page.h>.Elliott Hughes2014-02-241-1/+0
|/ / / | | | | | | | | | Change-Id: I000aead8c82ec11151f69e6ce439dd09b0f0b4f4
* | | Merge "Remove unused #includes of <asm/page.h>."Elliott Hughes2014-02-243-3/+0
|\ \ \ | |/ / |/| |
| * | Remove unused #includes of <asm/page.h>.Elliott Hughes2014-02-243-3/+0
|/ / | | | | | | | | | | (<asm/page.h> is going away.) Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
* | Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"Colin Cross2014-02-221-1/+1
|\ \
| * | Fix the definition of LOCAL_PATH in libusbhost/Android.mkKévin PETIT2014-02-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I870cac2f0e26644e4456743209aa45644d7e494b Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | Merge "Fix compiler warnings in libpixelflinger"Elliott Hughes2014-02-209-53/+54
|\ \ \
| * | | Fix compiler warnings in libpixelflingerAshok Bhat2014-02-209-53/+54
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a5708ae6bc934b196d59d81a6cd550b05ed704f Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | Merge "Add -D option to restorecon for relabeling /data/data."Nick Kralevich2014-02-201-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Add -D option to restorecon for relabeling /data/data.Stephen Smalley2014-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83. Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "Remove dead code."Elliott Hughes2014-02-207-764/+0
|\ \ \ \
| * | | | Remove dead code.Elliott Hughes2014-02-207-764/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | We have benchmarking for memset in bionic itself, and a benchmarking framework for other native benchmarking. Change-Id: I241a288a96d3b2d37f3d51b04a519ac23f18a989
* | | | Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"JP Abgrall2014-02-191-2/+2
|\ \ \ \
| * | | | Handle FUSE_FSYNCDIR as FUSE_FSYNCDaisuke Okitsu2014-02-191-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been issues with sdcard data corruption even after successfully calling fsync for /sdcard. This is caused by the sdcard daemon doing nothing in this case. Change-Id: I48149ceabdac79ac535b35c2598bb1fbb5410883
* | | | Merge "sdcard: direct I/O file access write buffer alignment"JP Abgrall2014-02-191-0/+6
|\ \ \ \
| * | | | sdcard: direct I/O file access write buffer alignmentArpad Horvath2014-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not enough to align the read buffer only, because consequent writes might still fail with EINVAL. The write buffer should be also aligned according to the write(2) manual page. Change-Id: I7547dec5208732c56f4466c1b0c88f36dabacf5b
* | | | | Merge "Enable building init with -Wall -Werror."Nick Kralevich2014-02-193-11/+46
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Enable building init with -Wall -Werror.Stephen Smalley2014-02-193-11/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminates various warnings from SELinux-related code. Bug: 12587913 Change-Id: I28921f0ebd934324436609540d95ccef58552b64 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "Start debuggerd64 for 64-bit processes"Colin Cross2014-02-161-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Start debuggerd64 for 64-bit processesDan Willemsen2014-02-161-0/+3
|/ / / | | | | | | | | | Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
* | | Merge "sdcard: direct I/O file access fix"JP Abgrall2014-02-151-4/+5
|\ \ \
| * | | sdcard: direct I/O file access fixArpad Horvath2014-02-141-4/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file is opened in direct I/O mode (with O_DIRECT flag), the read buffer addess must be aligned to memory page size boundary. The Direct I/O is not needed for normal files, however, some special hardware access (e.g. smart SD cards) will not work without it. Change-Id: I42babeee86dba1880fd23e2592fddd7060da3e20
* | | Merge "charger: add locale global variable"Colin Cross2014-02-131-0/+2
|\ \ \
| * | | charger: add locale global variableColin Cross2014-02-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions in minui reference a global extern char *locale. None of them are used by charger, but the bfd linker cannot optimize them out and fails to link charger. Define char *locale in charger.c so it can resolve the symbol. Change-Id: I738daf95d24356bf96bd226d91a5dc64b5d4dc9b
* | | | Merge "build debuggerd and debuggerd64 on 64-bit architectures"Colin Cross2014-02-132-50/+89
|\ \ \ \ | |/ / /
| * | | build debuggerd and debuggerd64 on 64-bit architecturesColin Cross2014-02-122-50/+89
|/ / / | | | | | | | | | Change-Id: I1518d45ae0c5e0fed31d071fdaf19a67bad1bdfc
* | | Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-124-6/+6
|\ \ \ | |/ / |/| |
| * | Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-074-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libselinux selinux_android_restorecon API is changing to the more general interface with flags and dropping the older variants. Also get rid of the old, no longer used selinux_android_setfilecon API and rename selinux_android_setfilecon2 to it as it is the only API in use. Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | Merge "pixelflinger: support multilib builds"Colin Cross2014-02-121-35/+31
|\ \ \
| * | | pixelflinger: support multilib buildsColin Cross2014-02-111-35/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the LOCAL_*_arch variables to support building for 32-bit and 64-bit at the same time. Change-Id: Ibef8044e8b6500a6aa111320eb35bcdaf51ad064
* | | | Merge "x86_64: Add atomic funtions"Elliott Hughes2014-02-122-1/+229
|\ \ \ \