Commit graph

7296 commits

Author SHA1 Message Date
Nick Kralevich
066cde92d2 am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit '223e07983718e1515f2a54542b9b0163a8f508ed':
  Enable building init with -Wall -Werror.
2014-02-19 19:13:39 +00:00
Nick Kralevich
223e079837 Merge "Enable building init with -Wall -Werror." 2014-02-19 19:09:30 +00:00
Stephen Smalley
eb3f421e02 Enable building init with -Wall -Werror.
Eliminates various warnings from SELinux-related code.

Bug: 12587913
Change-Id: I28921f0ebd934324436609540d95ccef58552b64
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-19 09:15:09 -05:00
Colin Cross
bb2da79fda am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:50:59 +00:00
Colin Cross
27fd413d6d Merge "Start debuggerd64 for 64-bit processes" 2014-02-16 19:46:55 +00:00
Dan Willemsen
78ef91aa5e Start debuggerd64 for 64-bit processes
Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
2014-02-16 11:30:27 -08:00
JP Abgrall
6e6140e0ad am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit 'f7cf1a062ef27b6579b9afb876d635a307b3d5d3':
  sdcard: direct I/O file access fix
2014-02-15 00:59:15 +00:00
JP Abgrall
f7cf1a062e Merge "sdcard: direct I/O file access fix" 2014-02-15 00:52:54 +00:00
Arpad Horvath
80b435a3f3 sdcard: direct I/O file access fix
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
2014-02-14 16:50:27 -08:00
Colin Cross
2bcf2437c8 am d0307bee: Merge "charger: add locale global variable"
* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
  charger: add locale global variable
2014-02-13 21:15:42 +00:00
Colin Cross
d0307beeef Merge "charger: add locale global variable" 2014-02-13 21:09:37 +00:00
Colin Cross
594f091700 am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit 'a6b770566e62196f2fff8ab25952c33deed90ea8':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:30:14 +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
488b5eafe3 am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:19:02 +00: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
f094fd035f am dc97eec0: Merge "pixelflinger: support multilib builds"
* commit 'dc97eec05232a5d64b6425043b48eafaf63cef7f':
  pixelflinger: support multilib builds
2014-02-12 19:22:49 +00:00
Elliott Hughes
620a880057 am 1c1bd845: Merge "x86_64: Add atomic funtions"
* commit '1c1bd8454915fde50b27db56739c34501f138937':
  x86_64: Add atomic funtions
2014-02-12 19:22:47 +00:00
Colin Cross
d8b63266aa am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"
* commit '7419498cb5fa53427d8aec95c4ad27e82cfec156':
  pixelflinger: use __builtin___clear_cache instead of cacheflush
2014-02-12 19:22: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
ec08c03cc7 am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"
* commit '85516e9d019a7f5af0e394ea767185c12ffbcd42':
  log: add compile-time checking when ALOGV is disabled
2014-02-10 22:19:51 +00: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
48e8183442 am 4207df11: Merge "Use stat structure to keep oldest mtime."
* commit '4207df11c5c09969b576324b4eea93a4c4e1ee99':
  Use stat structure to keep oldest mtime.
2014-02-08 02:22:04 +00: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
696c75c165 am 829ae5be: Merge "Remove a pre-uapi hack from nandread."
* commit '829ae5befa16efbd2ca4e974d702c2eaac3eab02':
  Remove a pre-uapi hack from nandread.
2014-02-08 01:17:51 +00: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
d90b11b6c1 am 13274a26: Merge "Fix logging errors inside ALOGV"
* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
  Fix logging errors inside ALOGV
2014-02-07 22:38:37 +00:00
Elliott Hughes
3bff7e3e65 am 136a9619: Merge "Use socklen_t instead of int in debuggerd."
* commit '136a961980f4c31da44fa496e0474754d42624e1':
  Use socklen_t instead of int in debuggerd.
2014-02-07 22:35:09 +00: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
e3b1810e7e am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
* commit '71de56a08cac3353334c2253748fdf8c37ec4aa1':
  Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-06 23:48:52 +00: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
61e92a0264 am 68835ee8: Merge "system/core LP64 cleanup."
* commit '68835ee88b146f654fe3ce007f07ace71266e876':
  system/core LP64 cleanup.
2014-02-06 02:59:38 +00: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
afdd1915f6 am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""
* commit 'eaba2bedf529eeb21351c8bf6365107cb6a4e8b6':
  Revert "Move to the canonical UniquePtr.h."
2014-02-04 23:46:14 +00:00
Elliott Hughes
eaba2bedf5 Merge "Revert "Move to the canonical UniquePtr.h."" 2014-02-04 23:41:58 +00:00