Colin Cross
6c0a1dd586
am d8b63266: am 7419498c: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"
...
* commit 'd8b63266aa7e8f89ef0dea7799a390c49b113518':
pixelflinger: use __builtin___clear_cache instead of cacheflush
2014-02-12 22:19:45 +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
Kévin PETIT
14893ec272
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
...
Change-Id: I870cac2f0e26644e4456743209aa45644d7e494b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-02-12 16:28:11 +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
aeeacff9ed
am ec08c03c: am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"
...
* commit 'ec08c03cc7261e42346bf7dd15109c202162593b':
log: add compile-time checking when ALOGV is disabled
2014-02-10 22:22:06 +00: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
25a619fb30
am 48e81834: am 4207df11: Merge "Use stat structure to keep oldest mtime."
...
* commit '48e818344250324ad89cacd23105a8035287d33b':
Use stat structure to keep oldest mtime.
2014-02-08 05:38:00 +00:00
Elliott Hughes
a1ebd4d5c8
am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."
...
* commit '696c75c165bbefd588b411103036b1193958ef6b':
Remove a pre-uapi hack from nandread.
2014-02-08 05:37:51 +00:00
Colin Cross
ec04a8d45b
am d90b11b6: am 13274a26: Merge "Fix logging errors inside ALOGV"
...
* commit 'd90b11b6c1905eb7c86dc2cf17314edb37ba4592':
Fix logging errors inside ALOGV
2014-02-08 05:37:30 +00:00
Elliott Hughes
00010369a6
am 3bff7e3e: am 136a9619: Merge "Use socklen_t instead of int in debuggerd."
...
* commit '3bff7e3e65d382a8474e0b20dbcf616cfdd82a2d':
Use socklen_t instead of int in debuggerd.
2014-02-08 05:37:26 +00: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
52ca10d15a
am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit 'e3b1810e7e15a12512beb285a83a65a803d55366':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-06 23:56:10 +00: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
b30b159f70
am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."
...
* commit '61e92a026472786ce81f4738e7d77bcad69697b8':
system/core LP64 cleanup.
2014-02-06 03:03:52 +00: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
c7cb88f167
am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""
...
* commit 'afdd1915f6f7fd4ea941daac20ba234e981ef376':
Revert "Move to the canonical UniquePtr.h."
2014-02-04 23:50:38 +00: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
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
4e9d3ce295
am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."
...
* commit '0056a41d2a1ffd75644451b54e4ccacbbba75a5c':
Move to the canonical UniquePtr.h.
2014-02-04 23:23:51 +00:00
Elliott Hughes
0056a41d2a
am 345fc625: Merge "Move to the canonical UniquePtr.h."
...
* commit '345fc6252a3e5c6113be893638f4746a54173489':
Move to the canonical UniquePtr.h.
2014-02-04 23:20:06 +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
925a3cd95a
am ddf872c0: am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"
...
* commit 'ddf872c0fb3e2a9cf9bfb197842d9bb4ccc164cd':
libsysutil: frequent native crash /system/bin/vold
2014-02-04 19:26:38 +00:00
Mark Salyzyn
ddf872c0fb
am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"
...
* commit '5931ea864599fc3ce29ed3b1ff8d4ff65413a168':
libsysutil: frequent native crash /system/bin/vold
2014-02-04 19:24:20 +00:00