Colin Cross
d0307beeef
Merge "charger: add locale global variable"
2014-02-13 21:09:37 +00:00
Colin Cross
ca0e5044a3
charger: add locale global variable
...
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
2014-02-13 12:25:21 -08:00
Colin Cross
a6b770566e
Merge "build debuggerd and debuggerd64 on 64-bit architectures"
2014-02-13 20:24:47 +00:00
Colin Cross
579c9bc8a4
build debuggerd and debuggerd64 on 64-bit architectures
...
Change-Id: I1518d45ae0c5e0fed31d071fdaf19a67bad1bdfc
2014-02-12 22:32:26 -08:00
Nick Kralevich
2e7347d617
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:28 +00:00
Colin Cross
dc97eec052
Merge "pixelflinger: support multilib builds"
2014-02-12 00:24:09 +00:00
Elliott Hughes
1c1bd84549
Merge "x86_64: Add atomic funtions"
2014-02-12 00:18:43 +00:00
Qiming Shi
4bc2f8db0a
x86_64: Add atomic funtions
...
This patch adds atomic functions for x86_64.
Change-Id: I298c760a1e6efa2ce2c61a143f833b6785805442
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-11 16:17:39 -08:00
Colin Cross
7419498cb5
Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"
2014-02-11 21:39:07 +00:00
Colin Cross
f88fb1fade
pixelflinger: support multilib builds
...
Use the LOCAL_*_arch variables to support building for 32-bit and
64-bit at the same time.
Change-Id: Ibef8044e8b6500a6aa111320eb35bcdaf51ad064
2014-02-11 13:36:14 -08:00
Colin Cross
32ea4a895c
pixelflinger: use __builtin___clear_cache instead of cacheflush
...
cacheflush doesn't exist on LP64 any more, and gcc's
__builtin___clear_cache is better in every way. Use it instead.
Change-Id: Ibbf6facbdefc15b6dda51d014e1c44fb7aa2b17d
2014-02-11 13:32:44 -08:00
Colin Cross
85516e9d01
Merge "log: add compile-time checking when ALOGV is disabled"
2014-02-10 22:14:10 +00:00
Colin Cross
810d19f99a
log: add compile-time checking when ALOGV is disabled
...
Wrap the call in a if (0) when verbose logging is disabled
to provide compile time checking.
Also add a printf format attribute to the function to warn
if parameters are incorrect.
Change-Id: Ic77edeadcc4d886ca0f8b434f8550e18e22d5901
2014-02-09 21:59:24 -08:00
Christopher Ferris
4207df11c5
Merge "Use stat structure to keep oldest mtime."
2014-02-08 02:13:58 +00:00
Christopher Ferris
68bd59f6d2
Use stat structure to keep oldest mtime.
...
Change-Id: If9496127db28d2dcd09bc5b3144632a43afb8d55
2014-02-07 18:08:38 -08:00
Elliott Hughes
829ae5befa
Merge "Remove a pre-uapi hack from nandread."
2014-02-08 01:12:49 +00:00
Elliott Hughes
2c1d62d622
Remove a pre-uapi hack from nandread.
...
We only have uapi headers now.
Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
2014-02-07 17:10:37 -08:00
Colin Cross
13274a2661
Merge "Fix logging errors inside ALOGV"
2014-02-07 22:31:26 +00:00
Elliott Hughes
136a961980
Merge "Use socklen_t instead of int in debuggerd."
2014-02-07 22:29:19 +00:00
Colin Cross
f4b0b7971c
Fix logging errors inside ALOGV
...
Fix errors exposed by adding checking to disabled ALOGVs.
Change-Id: I36b77bb0ad8dc7661b0f834f20d1179b86134d57
2014-02-07 13:26:04 -08:00
Elliott Hughes
0df8e4f86c
Use socklen_t instead of int in debuggerd.
...
Also other trivial C++ cleanup.
Change-Id: I9b5278c5205e0ea4f9dcbbe3e7b99921dd2436dc
2014-02-07 12:13:30 -08:00
Stephen Smalley
27a93650c0
Convert all selinux_android_restorecon and _setfilecon calls to new API.
...
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>
2014-02-07 09:38:32 -05:00
Nick Kralevich
71de56a08c
Merge "Unify toolbox restorecon and libselinux restorecon implementations."
2014-02-06 23:43:59 +00:00
Stephen Smalley
2761b71d3f
Unify toolbox restorecon and libselinux restorecon implementations.
...
Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command. This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions. Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).
Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-06 09:42:04 -05:00
Elliott Hughes
68835ee88b
Merge "system/core LP64 cleanup."
2014-02-06 02:12:05 +00:00
Elliott Hughes
5d9fe779c8
system/core LP64 cleanup.
...
Fixes -Wint-to-pointer and -Wpointer-to-int warnings, plus various -Wformat
warnings.
Change-Id: I6c5eea6b4273d82d28b8e5d2925f3e5457511b17
2014-02-05 18:02:11 -08:00
Elliott Hughes
eaba2bedf5
Merge "Revert "Move to the canonical UniquePtr.h.""
2014-02-04 23:41:58 +00:00
Elliott Hughes
5c4020005b
Revert "Move to the canonical UniquePtr.h."
...
This reverts commit 2a72c575d2 .
Change-Id: Idb485f1be2906e8c1c8f0da3df186a7aade027f6
2014-02-04 23:41:22 +00:00
Elliott Hughes
345fc6252a
Merge "Move to the canonical UniquePtr.h."
2014-02-04 23:15:52 +00:00
Elliott Hughes
2a72c575d2
Move to the canonical UniquePtr.h.
...
Change-Id: I5330c36d2b571acb6d3debd30b8020e33aa8a4a7
2014-02-04 11:58:51 -08:00
Mark Salyzyn
5931ea8645
Merge "libsysutil: frequent native crash /system/bin/vold"
2014-02-04 19:16:28 +00:00
Nick Kralevich
ba023b063d
Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
2014-02-04 18:31:51 +00:00
Christopher Ferris
3faf86c0d4
Merge "Call a specialized local map set."
2014-02-01 22:18:02 +00:00
Christopher Ferris
c47aa3bd2a
Merge "Fix mips build."
2014-02-01 22:13:17 +00:00
Christopher Ferris
c53c47364f
Fix mips build.
...
Change-Id: I5401ae6ca6553ebbec231166820c1c904355ec63
2014-02-01 12:23:03 -08:00
Christopher Ferris
73dc1cc3fb
Call a specialized local map set.
...
Bug: 12852152
Change-Id: I8a0c558bc218805b0e06371af0af055e4aa6e0bb
2014-02-01 11:53:33 -08:00
Elliott Hughes
cf53e5dbdf
Merge "Fix debuggerd's symbol offset output."
2014-02-01 07:48:24 +00:00
Elliott Hughes
f7b4b519e4
Fix debuggerd's symbol offset output.
...
Before:
00007fff33e489d8 00007ff286e4ad94 /system/lib64/libc.so (__libc_init+54u)
After:
00007fff45c6c158 00007f61bc36fd94 /system/lib64/libc.so (__libc_init+84)
Change-Id: I36796c99843a41583824a96793a5a4c81ddb666e
2014-01-31 23:13:55 -08:00
Elliott Hughes
434edbe6ff
Merge "LP64 should have debuggerd and debuggerd64."
2014-02-01 01:28:03 +00:00
Elliott Hughes
e9edf7a0ef
LP64 should have debuggerd and debuggerd64.
...
Change-Id: I4e39c200e6867bb9a5bbcfec1c449b8864028feb
2014-01-31 17:15:10 -08:00
Mark Salyzyn
4389588e8d
libsysutil: frequent native crash /system/bin/vold
...
regression from commit a6e965578e44f9ae5f98de822ba5decec381dffc
* wrap writev with sigaction SIG_IGN SIGPIPE to emulate the
send(,,,MSG_NOSIGNAL) call it had replaced.
(cherry pick from commit 83fc720785 )
BUG: 12796279
Change-Id: I14363630ada79c0a5b85bb6b2afd0a1c4d5c3109
2014-01-31 15:27:14 -08:00
Elliott Hughes
1bc6169f80
Merge "Remove dead code that looked like part of debuggerd."
2014-01-31 23:11:44 +00:00
Christopher Ferris
0fdf0dc725
Merge "Refactor makefile."
2014-01-31 22:55:50 +00:00
Elliott Hughes
6694d3e3d5
Remove dead code that looked like part of debuggerd.
...
Note that these were two different functions. The definition was unused,
and the declaration was undefined.
Change-Id: I2edd10a0ab9422cd5252bdb9ccdd726dc5fad531
2014-01-31 10:37:18 -08:00
Christopher Ferris
04b1e8c812
Refactor makefile.
...
With this change allow the creation of host backtrace libraries using
libunwind.
Change-Id: Ie48bb36cf0d2eccf94cb8ff516d829d8032f11f2
2014-01-31 10:16:52 -08:00
Elliott Hughes
51c4d4c431
Merge "AArch64: Port debuggerd"
2014-01-31 02:05:45 +00:00
Kévin PETIT
abc60c26b7
AArch64: Port debuggerd
...
Change-Id: Ib18f76f375a1d70c84e0a09d221e17ac43144b96
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-30 18:05:03 -08:00
Elliott Hughes
e94985a251
Merge "Increase the scope of other reused definitions."
2014-01-31 01:52:17 +00:00
Elliott Hughes
ba0cecf8e3
Increase the scope of other reused definitions.
...
(Testing this in a non-x86 tree, as I'd been doing, was no testing at all.)
Change-Id: I6c5d08e9d566554c212feb8499238aeadf877dad
2014-01-30 17:51:18 -08:00
Elliott Hughes
5434bf6640
Merge "LP64: Enable debuggerd/libbacktrace/libunwind."
2014-01-31 01:48:16 +00:00