summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.Elliott Hughes2015-04-029-20/+0
| | | | Change-Id: I720b8ef1050da45a7833adef8219b6acb2cf3a38
* Merge "Move all libcutils tests into the gtests."Elliott Hughes2015-04-026-90/+101
|\
| * Move all libcutils tests into the gtests.Elliott Hughes2015-04-026-90/+101
|/ | | | | | | | | | | This also fixes the bug where we were always testing against the fake strlcpy we provide for glibc/Windows rather than the Android one. This also removes some unnecessary library dependencies. This also builds all the cutils tests for the host (static and dynamic). Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
* Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."Elliott Hughes2015-04-024-73/+327
|\
| * Move mips/mips64 android_memset16/android_memset32 into libcutils.Elliott Hughes2015-04-024-73/+327
|/ | | | Change-Id: Ia826dd872f64cc80635f50525a0c393f43ae5204
* Merge "toolbox: ioctl: fix signedness on ioctl_nr"Elliott Hughes2015-04-021-49/+96
|\
| * toolbox: ioctl: fix signedness on ioctl_nrChris Fries2015-04-011-49/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | ioctl_nr is passed signed to the kernel, but many users refer to ioctl's in unsigned 32 bit notation. Let's use stroll to set it, to let people specify either negative numbers or large positive numbers. Also improve error reporting. Reported-By: Alex Piliev <ktnr74@motorola.com> Change-Id: I789434895b70b051d4d5c1a5db566a1925478ef0
* | Merge "Fix shared version of libcutils on the host to include strlcpy"Brian Carlstrom2015-04-021-1/+1
|\ \
| * | Fix shared version of libcutils on the host to include strlcpyBrian Carlstrom2015-04-021-1/+1
|/ / | | | | | | Change-Id: Ic727508d9cfadea0050d1ccc491ee61aac1ef55a
* | Merge "sdcard: Turn on noatime for fuse mounted sdcard"Elliott Hughes2015-04-011-1/+2
|\ \
| * | sdcard: Turn on noatime for fuse mounted sdcardJohan Redestig2015-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | This provides symmetry with /data and /cache that are typically mounted with noatime. Change-Id: I6fe1bead368b52632424b03b50d4081852824cdb
* | | Merge "Discards frames for code within library."Christopher Ferris2015-04-014-17/+54
|\ \ \
| * | | Discards frames for code within library.Christopher Ferris2015-04-014-17/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a local unwind, do not include the frames that come from either libunwind or libbacktrace. Bug: 11518609 Change-Id: I0ec8d823aebbfa0903e61b16b7e5663f3fd65e78
* | | | Merge "Revert "Disable the static libcutils tests.""Dan Albert2015-04-011-17/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Disable the static libcutils tests."Dan Albert2015-04-011-17/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move them to libc++ since stlport is dead. Bug: 18389856 This reverts commit bb28776db0f5a107ef2b90ff1322f4c06b6cc7de. Change-Id: Icdf9be3bc5cc40433727ff71a121b145002dda72
* | | Merge "Link libc++_static into fs_mgr."Dan Albert2015-04-011-0/+1
|\ \ \
| * | | Link libc++_static into fs_mgr.Dan Albert2015-04-011-0/+1
|/ / / | | | | | | | | | Change-Id: Ic2461d3a30dbd8a22f9800a33fac27c658340b21
* | | Merge "logd: missing include for string.h"Mark Salyzyn2015-04-011-0/+1
|\ \ \
| * | | logd: missing include for string.hMark Salyzyn2015-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LogCommand.cpp gets string.h inherited from private/android_filesystem_config.h it should not rely on this in the future. The intent is to move fs_config function into libcutils and thus deprecate any need for string.h in this include file. Bug: 19908228 Change-Id: Iaf3a77298b56efd8004300b17e9a1faafad5b08b
* | | | Merge "package missing include for string.h"Mark Salyzyn2015-04-011-2/+4
|\ \ \ \
| * | | | package missing include for string.hMark Salyzyn2015-04-011-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package.c gets string.h inherited from private/android_filesystem_config.h it should not rely on this in the future. The intent is to move fs_config function into libcutils and thus deprecate any need for string.h in this include file. Bug: 19908228 Change-Id: I5db6d0a88c5b1eb9f582284e9bdd220c096ea69a
* | | | Merge "Remove no-op "capabilities"."Elliott Hughes2015-04-012-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove no-op "capabilities".Elliott Hughes2015-04-012-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This never worked, and implementing it would just be an attempt to cling to the pre-SELinux past. Change-Id: Iecba2affa50ee49ccf62677a607bfae95cb0aaf7
* | | | Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-019-30/+174
|\ \ \ \
| * | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-319-30/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
* | | | | Merge "Add verbose param to sparse_file_import_auto"Mohamad Ayyash2015-04-014-5/+6
|\ \ \ \ \
| * | | | | Add verbose param to sparse_file_import_autoMohamad Ayyash2015-03-314-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c5607f7aa5e964abc2031bbe71ff5c6e6ef56cc Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | | | | Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-014-16/+38
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Define atrace_* functions for both target and host.Richard Uhler2015-03-274-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines atrace_* functions for the host that act as no-ops, which makes it easier to add tracing in ART. Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
* | | | | | Merge "Refactor the code."Christopher Ferris2015-03-3123-770/+770
|\ \ \ \ \ \
| * | | | | | Refactor the code.Christopher Ferris2015-03-3123-770/+770
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The object hierarchy was confusing and convoluted. This removes a lot of unnecessary code, and consolidates the BacktraceCurrent and BacktraceThread code into BacktraceCurrent. Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
* | | | | | Merge "Add -Wno-inline-asm to Clang flags."Stephen Hines2015-03-312-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add -Wno-inline-asm to Clang flags.Stephen Hines2015-03-312-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists. This is a problem for libraries that are attempting to save all register state. Change-Id: I1ce80530f8be85fd74e949d0c65b60080e0aaf2a
* | | | | | Merge "run-as: bracket capability"Mark Salyzyn2015-03-311-45/+48
|\ \ \ \ \ \
| * | | | | | run-as: bracket capabilityMark Salyzyn2015-03-311-45/+48
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not assume that caller has granted effective bits in capabilities - only elevate capabilities when needed - suppress capabilities before exec when called as shell,shell,shell - some Android coding standard cleanup Bug: 19908228 Change-Id: Ibe3d1c1a0fdcb54c41d7a72395e50ad749df98ce
* | | | | | Merge "adb: Add option to reboot into sideload mode in recovery"Tao Bao2015-03-303-35/+79
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | adb: Add option to reboot into sideload mode in recoveryTao Bao2015-03-303-35/+79
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it requires manual key press to enter the sideload mode. This CL adds 'adb reboot sideload' to reboot the device into sideload mode directly with text display on. With 'adb reboot sideload-auto-reboot', it will reboot after the sideload regardless of the installation result, unless interrupted by user. Since it needs to write to /cache/recovery/command file, 'adb root' is required before calling 'adb reboot sideload' and the one with '-auto-reboot'. Also it requires the matching CL in bootable/recovery. Change-Id: Ib7bd4e216a1efc01e64460659c97c6005bbaec1b
* | | | | Merge "Build init with clang."Elliott Hughes2015-03-301-0/+5
|\ \ \ \ \
| * | | | | Build init with clang.Elliott Hughes2015-03-301-0/+5
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I14d95b3fe0505dd7d7632e2eedc537f97553c715
* | | | | Merge "Lose route to toybox."Elliott Hughes2015-03-302-114/+0
|\ \ \ \ \
| * | | | | Lose route to toybox.Elliott Hughes2015-03-302-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
* | | | | | Merge "Always unlink /dev/__kmsg__."Elliott Hughes2015-03-301-4/+1
|\ \ \ \ \ \
| * | | | | | Always unlink /dev/__kmsg__.Elliott Hughes2015-03-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether the open succeeds or fails, we should unlink. Change-Id: Ic2f1e10dc7b6d6e459c56049da00d165bd63ba8f
* | | | | | | Merge "Enable building libbase on Windows."Dan Albert2015-03-301-4/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Enable building libbase on Windows.Dan Albert2015-03-301-4/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to exclude the logging facilities for now (since we don't have a std::mutex on Windows), but there's plenty else in here that is worth having. Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
* | | | | | Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"Elliott Hughes2015-03-301-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)Johan Redestig2015-03-301-1/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ioctl(BLKGETSIZE) expects unsigned long (8 bytes on 64 bit environment). Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
* | | | | Merge "Lose load_policy to toybox."Elliott Hughes2015-03-282-50/+0
|\ \ \ \ \
| * | | | | Lose load_policy to toybox.Elliott Hughes2015-03-282-50/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I3ef3aab9eef8e07ee598e2559a316e2fccf7199b
* | | | | Merge "Clarify a few things about bootcharts."Elliott Hughes2015-03-282-14/+13
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.2)