Commit Graph

7272 Commits

Author SHA1 Message Date
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 7419498cb5 Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush" 2014-02-11 21:39:07 +00: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
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
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 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 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
Mark Salyzyn 5931ea8645 Merge "libsysutil: frequent native crash /system/bin/vold" 2014-02-04 19:16:28 +00:00
Nick Kralevich 7e3d72d974 am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit 'ba023b063d25b73923f2df536b6258967f756ff6':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 18:37:36 +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 77b2302331 am 3faf86c0: Merge "Call a specialized local map set."
* commit '3faf86c0d4b98e7d26edbe8d1c8a8a231c86a234':
  Call a specialized local map set.
2014-02-03 00:45:02 +00:00
Christopher Ferris f355750def am c47aa3bd: Merge "Fix mips build."
* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
  Fix mips build.
2014-02-03 00:45:02 +00:00
Elliott Hughes 784b6181cf am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
* commit 'cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509':
  Fix debuggerd's symbol offset output.
2014-02-03 00:45:01 +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 da9b5dab2d am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."
* commit '434edbe6fffb9445316567ac6de3f407c005b37b':
  LP64 should have debuggerd and debuggerd64.
2014-02-01 01:33:51 +00: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 2e9dcd21d3 am 1bc6169f: Merge "Remove dead code that looked like part of debuggerd."
* commit '1bc6169f80fb02957695351ce8b4f49d0c019382':
  Remove dead code that looked like part of debuggerd.
2014-01-31 23:21:36 +00:00
Elliott Hughes 1bc6169f80 Merge "Remove dead code that looked like part of debuggerd." 2014-01-31 23:11:44 +00:00
Christopher Ferris 3133a4a203 am 0fdf0dc7: Merge "Refactor makefile."
* commit '0fdf0dc725a130b39a4232262b77c17ff053ef23':
  Refactor makefile.
2014-01-31 23:01:23 +00:00