Elliott Hughes
a1f69f1808
am 21593186: Merge "Move all libcutils tests into the gtests."
...
* commit '2159318647b6032a9d752012b923c579dc1f80da':
Move all libcutils tests into the gtests.
2015-04-02 21:35:18 +00:00
Elliott Hughes
2159318647
Merge "Move all libcutils tests into the gtests."
2015-04-02 21:26:32 +00:00
Elliott Hughes
af98efbd15
Move all libcutils tests into the gtests.
...
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
2015-04-02 14:25:55 -07:00
Elliott Hughes
84ab55632a
am d8fb29b0: Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."
...
* commit 'd8fb29b0c09de25c416141a4bb150cc7db9f28ca':
Move mips/mips64 android_memset16/android_memset32 into libcutils.
2015-04-02 20:43:22 +00:00
Elliott Hughes
d8fb29b0c0
Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."
2015-04-02 20:35:20 +00:00
Elliott Hughes
a492f3797a
Move mips/mips64 android_memset16/android_memset32 into libcutils.
...
Change-Id: Ia826dd872f64cc80635f50525a0c393f43ae5204
2015-04-02 11:59:22 -07:00
Elliott Hughes
19d00adb2b
am 27a158be: Merge "toolbox: ioctl: fix signedness on ioctl_nr"
...
* commit '27a158befa90fd8fb965091510d9a3e9079b04f4':
toolbox: ioctl: fix signedness on ioctl_nr
2015-04-02 17:30:39 +00:00
Elliott Hughes
27a158befa
Merge "toolbox: ioctl: fix signedness on ioctl_nr"
2015-04-02 17:22:23 +00:00
Brian Carlstrom
8c755dfe4c
am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"
...
* commit 'c7cddffa14369265c82e5a08797f7ba687d174ef':
Fix shared version of libcutils on the host to include strlcpy
2015-04-02 13:44:40 +00:00
Brian Carlstrom
c7cddffa14
Merge "Fix shared version of libcutils on the host to include strlcpy"
2015-04-02 07:51:10 +00:00
Brian Carlstrom
60a347fc87
Fix shared version of libcutils on the host to include strlcpy
...
Change-Id: Ic727508d9cfadea0050d1ccc491ee61aac1ef55a
2015-04-02 00:43:45 -07:00
Elliott Hughes
2d4a347eb5
am fad9b3eb: Merge "sdcard: Turn on noatime for fuse mounted sdcard"
...
* commit 'fad9b3ebb8f5966e2afd7ff65d78ecc3330aaa3e':
sdcard: Turn on noatime for fuse mounted sdcard
2015-04-02 02:13:22 +00:00
Christopher Ferris
2be40f767b
am 88628e2b: Merge "Discards frames for code within library."
...
* commit '88628e2baf83a604f9b443d0c1b67cd11f4ceef3':
Discards frames for code within library.
2015-04-02 02:13:21 +00:00
Elliott Hughes
fad9b3ebb8
Merge "sdcard: Turn on noatime for fuse mounted sdcard"
2015-04-02 02:05:42 +00:00
Christopher Ferris
88628e2baf
Merge "Discards frames for code within library."
2015-04-02 01:24:22 +00:00
Dan Albert
a7be34404c
am 7ab2c78e: Merge "Revert "Disable the static libcutils tests.""
...
* commit '7ab2c78ee9a7df21d149b6c5228f9d0fccb066e0':
Revert "Disable the static libcutils tests."
2015-04-02 00:59:19 +00:00
Dan Albert
7ab2c78ee9
Merge "Revert "Disable the static libcutils tests.""
2015-04-01 23:48:06 +00:00
Dan Albert
43db1c347b
Revert "Disable the static libcutils tests."
...
Also move them to libc++ since stlport is dead.
Bug: 18389856
This reverts commit bb28776db0
.
Change-Id: Icdf9be3bc5cc40433727ff71a121b145002dda72
2015-04-01 16:45:28 -07:00
Christopher Ferris
ca09ce902c
Discards frames for code within library.
...
When doing a local unwind, do not include the frames that come
from either libunwind or libbacktrace.
Bug: 11518609
Change-Id: I0ec8d823aebbfa0903e61b16b7e5663f3fd65e78
2015-04-01 15:58:20 -07:00
Chris Fries
4868b07931
toolbox: ioctl: fix signedness on ioctl_nr
...
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
2015-04-01 15:46:20 -07:00
Dan Albert
4f6c526e13
am 3891cfef: Merge "Link libc++_static into fs_mgr."
...
* commit '3891cfef5e27da0f33ccab42e9a14cc1e38331ee':
Link libc++_static into fs_mgr.
2015-04-01 20:37:48 +00:00
Dan Albert
3891cfef5e
Merge "Link libc++_static into fs_mgr."
2015-04-01 20:27:57 +00:00
Dan Albert
bbbc634e09
Link libc++_static into fs_mgr.
...
Change-Id: Ic2461d3a30dbd8a22f9800a33fac27c658340b21
2015-04-01 13:26:04 -07:00
Mark Salyzyn
4bf0438083
am 22155474: Merge "logd: missing include for string.h"
...
* commit '221554749337a9c961c192596be5eb4e42083733':
logd: missing include for string.h
2015-04-01 19:38:05 +00:00
Mark Salyzyn
5bcbcb50ba
am 4f6e51a0: Merge "package missing include for string.h"
...
* commit '4f6e51a032892b1a053efa2b41ebb29e4f1bb5be':
package missing include for string.h
2015-04-01 19:38:03 +00:00
Mark Salyzyn
2215547493
Merge "logd: missing include for string.h"
2015-04-01 19:27:09 +00:00
Mark Salyzyn
4f6e51a032
Merge "package missing include for string.h"
2015-04-01 19:26:50 +00:00
Elliott Hughes
0dd1dd2f31
am a57fb596: Merge "Remove no-op "capabilities"."
...
* commit 'a57fb596f31ae415446841b35dd8aefe8273b409':
Remove no-op "capabilities".
2015-04-01 18:48:16 +00:00
Elliott Hughes
a57fb596f3
Merge "Remove no-op "capabilities"."
2015-04-01 18:37:06 +00:00
Mark Salyzyn
801bcecbb5
logd: missing include for string.h
...
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
2015-04-01 11:18:42 -07:00
Mark Salyzyn
68ffc74e32
package missing include for string.h
...
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
2015-04-01 11:15:37 -07:00
Paul Lawrence
ffe5c0d12d
am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support"""
...
* commit '27cda9a535c80470e913156e412cbf7e60c3217c':
Revert "Revert "Adding e4crypt support""
2015-04-01 17:50:35 +00:00
Paul Lawrence
27cda9a535
Merge "Revert "Revert "Adding e4crypt support"""
2015-04-01 17:40:38 +00:00
Mohamad Ayyash
ed92659690
am 6900d34e: Merge "Add verbose param to sparse_file_import_auto"
...
* commit '6900d34ed8949b67b8bac36f91f062b90ad847dd':
Add verbose param to sparse_file_import_auto
2015-04-01 17:37:12 +00:00
Richard Uhler
b3b1757fd9
am 0c266ef2: Merge "Define atrace_* functions for both target and host."
...
* commit '0c266ef2d7e137efbd83366a98a861d9770fbf06':
Define atrace_* functions for both target and host.
2015-04-01 17:37:10 +00:00
Mohamad Ayyash
6900d34ed8
Merge "Add verbose param to sparse_file_import_auto"
2015-04-01 17:34:58 +00:00
Richard Uhler
0c266ef2d7
Merge "Define atrace_* functions for both target and host."
2015-04-01 17:29:34 +00:00
Elliott Hughes
b022b8428c
Remove no-op "capabilities".
...
This never worked, and implementing it would just be an attempt to cling to
the pre-SELinux past.
Change-Id: Iecba2affa50ee49ccf62677a607bfae95cb0aaf7
2015-04-01 10:20:52 -07:00
Christopher Ferris
246e9d502c
am 9dc41d5d: Merge "Refactor the code."
...
* commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd':
Refactor the code.
2015-03-31 21:15:52 +00:00
Christopher Ferris
9dc41d5d34
Merge "Refactor the code."
2015-03-31 21:11:36 +00:00
Stephen Hines
0ede6ef3a5
am 9c01c44b: Merge "Add -Wno-inline-asm to Clang flags."
...
* commit '9c01c44bd6641f934afeece3c2ab2ab91e791dfc':
Add -Wno-inline-asm to Clang flags.
2015-03-31 21:02:41 +00:00
Stephen Hines
9c01c44bd6
Merge "Add -Wno-inline-asm to Clang flags."
2015-03-31 20:56:06 +00:00
Paul Lawrence
b8c9d273a0
Revert "Revert "Adding e4crypt support""
...
Fix build break caused by original change
This reverts commit 84b0bab58f
.
Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
2015-03-31 13:02:13 -07:00
Mohamad Ayyash
80cc1f6864
Add verbose param to sparse_file_import_auto
...
Change-Id: I0c5607f7aa5e964abc2031bbe71ff5c6e6ef56cc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-31 12:09:37 -07:00
Christopher Ferris
2c43cff01d
Refactor the code.
...
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
2015-03-31 10:51:44 -07:00
Mark Salyzyn
3cc18a2cf9
am b6f38def: Merge "run-as: bracket capability"
...
* commit 'b6f38def22add4b5d6878185d238f91659239161':
run-as: bracket capability
2015-03-31 17:46:42 +00:00
Mark Salyzyn
b6f38def22
Merge "run-as: bracket capability"
2015-03-31 17:41:14 +00:00
Mark Salyzyn
db5334ad03
run-as: bracket capability
...
- 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
2015-03-31 09:44:48 -07:00
Stephen Hines
035e9ba97e
Add -Wno-inline-asm to Clang flags.
...
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
2015-03-31 09:41:24 -07:00
Tao Bao
e9c2a4a0a4
am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'cd153076dc27b9a53fddec35eb050f44239d5af3':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:03:31 +00:00