Nick Kralevich
202be73b62
am f10492d8
: am 066cde92
: am 223e0798
: Merge "Enable building init with -Wall -Werror."
...
* commit 'f10492d8c0c907fad6f87c871fec6b2fac41a02c':
Enable building init with -Wall -Werror.
2014-02-19 19:23:13 +00:00
Nick Kralevich
f10492d8c0
am 066cde92
: am 223e0798
: Merge "Enable building init with -Wall -Werror."
...
* commit '066cde92d267986424ff79f35881116da3c672f8':
Enable building init with -Wall -Werror.
2014-02-19 19:19:06 +00:00
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
b6391ce26b
am ee9de136
: am bb2da79f
: am 27fd413d
: Merge "Start debuggerd64 for 64-bit processes"
...
* commit 'ee9de136c52555e8775611ad32fc8ee47c75e3d1':
Start debuggerd64 for 64-bit processes
2014-02-16 19:57:27 +00:00
Colin Cross
ee9de136c5
am bb2da79f
: am 27fd413d
: Merge "Start debuggerd64 for 64-bit processes"
...
* commit 'bb2da79fdab68c9643a30f5156e7dcabb379b139':
Start debuggerd64 for 64-bit processes
2014-02-16 19:54:13 +00: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
133993b486
am a183eb3e
: am 6e6140e0
: am f7cf1a06
: Merge "sdcard: direct I/O file access fix"
...
* commit 'a183eb3e737eda4de270b31b1a71462aed49eee9':
sdcard: direct I/O file access fix
2014-02-15 01:04:38 +00:00
JP Abgrall
a183eb3e73
am 6e6140e0
: am f7cf1a06
: Merge "sdcard: direct I/O file access fix"
...
* commit '6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a':
sdcard: direct I/O file access fix
2014-02-15 01:01:20 +00: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
Paul Lawrence
b6e3b3cea2
Merge "Mount default encrypted devices at boot"
2014-02-14 15:24:41 +00:00
Nick Kralevich
0f18bb1fe0
Merge "lowmemorykiller: make perms 0220"
2014-02-13 22:10:48 +00:00
Nick Kralevich
b3739735b8
lowmemorykiller: make perms 0220
...
Set
* /sys/module/lowmemorykiller/parameters/adj
* /sys/module/lowmemorykiller/parameters/minfree
to 0220. This better indicates that these files are only intended
to be written to, never read.
Change-Id: I9ef054f032b3955e04128fc1a472a17c7b1fa792
2014-02-13 13:58:21 -08:00
Colin Cross
1c38f5d958
resolved conflicts for merge of 1fef485f
to master
...
Change-Id: If402e68292a183064afe35cb77a4437682ee373a
2014-02-13 13:34:37 -08:00
Colin Cross
1fef485fcc
am 2bcf2437
: am d0307bee
: Merge "charger: add locale global variable"
...
* commit '2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51':
charger: add locale global variable
2014-02-13 21:19:16 +00: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
fb31448b6f
am c5f3e0dc
: am 594f0917
: am a6b77056
: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
...
* commit 'c5f3e0dc092a3132b93d6784103c089ea9cf12ce':
build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:38:00 +00:00
Colin Cross
c5f3e0dc09
am 594f0917
: am a6b77056
: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
...
* commit '594f0917000de7cc8bd8f184eede96a17cafd777':
build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:35:38 +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
3049f23915
am e41420bd
: am 488b5eaf
: am 2e7347d6
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:19:47 +00:00
Nick Kralevich
e41420bd8c
am 488b5eaf
: am 2e7347d6
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '488b5eafe368781077b367a9afd68db303bc8891':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:12:52 +00: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
b49443d1b6
am 28613a3c
: am f094fd03
: am dc97eec0
: Merge "pixelflinger: support multilib builds"
...
* commit '28613a3c447d6ebdc30375ad5c6272c0c911e795':
pixelflinger: support multilib builds
2014-02-12 23:00:26 +00:00
Elliott Hughes
a5d04cf62c
am fcd4dad3
: am 620a8800
: am 1c1bd845
: Merge "x86_64: Add atomic funtions"
...
* commit 'fcd4dad3967de79450549e78524ac73f775b51f2':
x86_64: Add atomic funtions
2014-02-12 23:00:26 +00:00
Colin Cross
ef5000d10b
am 6c0a1dd5
: am d8b63266
: am 7419498c
: Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"
...
* commit '6c0a1dd58653b0253142625c5be2049617d13b6c':
pixelflinger: use __builtin___clear_cache instead of cacheflush
2014-02-12 23:00:25 +00:00
Colin Cross
28613a3c44
am f094fd03
: am dc97eec0
: Merge "pixelflinger: support multilib builds"
...
* commit 'f094fd035f343b3704b3574ce0005fc0e4666db5':
pixelflinger: support multilib builds
2014-02-12 22:19:48 +00:00
Elliott Hughes
fcd4dad396
am 620a8800
: am 1c1bd845
: Merge "x86_64: Add atomic funtions"
...
* commit '620a8800577743023490cd24b73a4d0a5b755d6e':
x86_64: Add atomic funtions
2014-02-12 22:19:47 +00:00
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
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
62ea114e53
am aeeacff9
: am ec08c03c
: am 85516e9d
: Merge "log: add compile-time checking when ALOGV is disabled"
...
* commit 'aeeacff9ed2137bb06130555d8360b09bd75252c':
log: add compile-time checking when ALOGV is disabled
2014-02-10 22:24:03 +00: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