Commit graph

7927 commits

Author SHA1 Message Date
Andrew Hsieh
7ab32aca56 Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO" 2014-06-04 07:11:00 +00:00
Elliott Hughes
b122da648d Merge "Fix libcutils/dlmalloc_stubs.c build breakage." 2014-06-04 03:50:33 +00:00
Elliott Hughes
7f0ef73e70 Fix libcutils/dlmalloc_stubs.c build breakage.
Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
2014-06-03 20:48:44 -07:00
Mathieu Chartier
d586e35652 Merge "Fix build." 2014-06-04 01:17:07 +00:00
Mathieu Chartier
e942d1f9ea Fix build.
Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
2014-06-03 18:12:29 -07:00
Christopher Ferris
a8a7f001f1 Merge "Fix x86 and x86_64 builds." 2014-06-04 00:17:54 +00:00
Christopher Ferris
3520086e3d Fix x86 and x86_64 builds.
Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
2014-06-03 17:13:37 -07:00
Elliott Hughes
ddde05f3ee Merge "[MIPS64] Build debuggerd for mips64" 2014-06-03 23:26:33 +00:00
Duane Sand
a80b759857 [MIPS64] Build debuggerd for mips64
Change-Id: I361e9668baa218fc01e723c2df1a34ca6329cf47
2014-06-03 16:24:57 -07:00
Mathieu Chartier
ed30b7ea75 Merge "Fix build." 2014-06-03 22:35:23 +00:00
Elliott Hughes
d3b61d184e Merge "Clean up the debuggerd makefile." 2014-06-03 22:34:28 +00:00
Mathieu Chartier
0b9674f241 Fix build.
Change-Id: I6bafe6221e1ce7e4b04269df90996ab08b050e93
2014-06-03 15:32:10 -07:00
Elliott Hughes
8c597684b1 Clean up the debuggerd makefile.
In particular, turn on -Wunused, which is globally off by default
thanks to build/core/config.mk.

Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
2014-06-03 15:12:07 -07:00
Mathieu Chartier
03b87b49fa Merge "Make host ashmem_create_region seed only once." 2014-06-03 19:02:35 +00:00
Mathieu Chartier
1104ae8cfc Make host ashmem_create_region seed only once.
Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.

Bug: 15394258
Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
2014-06-03 11:47:58 -07:00
Mark Salyzyn
b0b343d086 Merge "liblog: test: Send bionc's fatal logging to the crash log" 2014-06-03 17:12:31 +00:00
Mark Salyzyn
90aa3d59a5 liblog: test: Send bionc's fatal logging to the crash log
Bug: 14159417
Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
2014-06-03 09:29:11 -07:00
Nick Kralevich
82015d4f12 Merge "Only allow disabling SELinux on userdebug / eng builds" 2014-06-03 16:17:52 +00:00
Narayan Kamath
4e26c95a63 Merge "Skip the "--abi" flag on "adb install" if present." 2014-06-03 09:58:24 +00:00
Nick Kralevich
f3c85b2488 Only allow disabling SELinux on userdebug / eng builds
Only parse and honor the kernel command line on userdebug
or eng builds. On user builds, assume that selinux is always enabled
and enforcing.

Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
2014-06-02 20:56:04 -07:00
JP Abgrall
676f7d509d am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7':
  libcutils: fix rw FS remount check issue
2014-06-03 01:05:33 +00:00
JP Abgrall
fc85a7a848 Merge "libcutils: fix rw FS remount check issue" 2014-06-03 01:01:36 +00:00
Hong-Mei Li
88f7683d9c libcutils: fix rw FS remount check issue
In some condition, some of FS would set disable_roll_forward option.
In this case, when we do power off or reboot, the power down progress
would stuck at android_reboot for 360 sec.
The reason is, remount_ro_done function check key word "rw" to determine
whether all the read-write FS has been remounted as read-only FS.
Unfortunately, it takes disable_roll_forward as a rw flag too by
mistake, so the check would always fail, until reach 360 sec threshold.

The patch would match "rw," from mount options, this can avoid the issue
successfully.

Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2014-06-02 22:45:37 -07:00
Mark Salyzyn
00d7097963 am bf0f2590: Merge "liblog: cache getuid() syscall"
* commit 'bf0f25905b12581f05b65b1ebe95211c727ae483':
  liblog: cache getuid() syscall
2014-06-02 20:11:56 +00:00
Mark Salyzyn
bf0f25905b Merge "liblog: cache getuid() syscall" 2014-06-02 20:09:19 +00:00
Mark Salyzyn
076ba81ce9 liblog: cache getuid() syscall
BUG: 15315766
Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
2014-06-02 12:33:57 -07:00
Nick Kralevich
6fb92bd84b am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
* commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a':
  SELinux changes to check policy versions during a reload.
2014-05-31 05:05:52 +00:00
Nick Kralevich
252b0e2b46 Merge "SELinux changes to check policy versions during a reload." 2014-05-31 05:03:05 +00:00
Dan Albert
e8f90ca60d am 570cd46d: Merge "Revert "Move libutils to libc++""
* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"
2014-05-30 20:17:32 +00:00
Dan Albert
570cd46d14 Merge "Revert "Move libutils to libc++"" 2014-05-30 20:13:48 +00:00
Dan Albert
7bc49a16e8 Revert "Move libutils to libc++"
Causes issues in the unbundled branches.

This reverts commit dc133729b0.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
2014-05-30 19:40:58 +00:00
Dan Albert
36f536fc7b am 9f69e028: Merge "Move libutils to libc++"
* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
  Move libutils to libc++
2014-05-30 18:40:25 +00:00
Dan Albert
9f69e028f7 Merge "Move libutils to libc++" 2014-05-30 18:32:08 +00:00
Mark Salyzyn
265262a8b2 am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
* commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390':
  String16.cpp rm unused utils/Debug.h
2014-05-29 23:52:54 +00:00
Mark Salyzyn
5f815da3ab Merge "String16.cpp rm unused utils/Debug.h" 2014-05-29 23:51:17 +00:00
Mark Salyzyn
6443033f6d String16.cpp rm unused utils/Debug.h
Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
2014-05-29 13:14:35 -07:00
Dave Allison
dec41a388d am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
  Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 19:57:50 +00:00
Dave Allison
967729b7ca Merge "Add LD_PRELOAD for libsigchain.so to the environment" 2014-05-29 19:51:42 +00:00
Dan Albert
dc133729b0 Move libutils to libc++
Bug: 15193147
Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
2014-05-29 10:19:39 -07:00
Narayan Kamath
a284f8b214 Skip the "--abi" flag on "adb install" if present.
This flag needs to be passed through to the package manager.
Without this change, the argument to this flag is interpreted
as a filename.

NOTE: If we don't want to add special treatment for this flag,
we'll have to assume that all flags with a -- prefix have an
argument, and that isn't necessarily true.

Change-Id: I78c3fa842bc24148d83d7278e6dee395686240a0
2014-05-29 15:54:10 +01:00
Elliott Hughes
c752d6dd37 am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:41:25 +00:00
Elliott Hughes
bf082ffb71 Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:35:57 +00:00
Mark Salyzyn
6445b40e93 am 811f2c0b: Merge "system/window.h: add deprecation warnings"
* commit '811f2c0b98d6f8935123221648c96ff975688902':
  system/window.h: add deprecation warnings
2014-05-28 19:28:30 +00:00
Mark Salyzyn
811f2c0b98 Merge "system/window.h: add deprecation warnings" 2014-05-28 19:25:15 +00:00
Nick Kralevich
c4ffa5f62e am c290bed0: Merge "Remove dmesg_restrict"
* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
  Remove dmesg_restrict
2014-05-28 13:11:38 +00:00
Nick Kralevich
c290bed035 Merge "Remove dmesg_restrict" 2014-05-28 13:09:34 +00:00
Torne (Richard Coles)
a8329a36ca am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
  Add UID and directory for RELRO sharing support.
2014-05-28 10:17:44 +00:00
Torne (Richard Coles)
96109cf36c Merge "Add UID and directory for RELRO sharing support." 2014-05-28 10:15:46 +00:00
Nick Kralevich
1a6184baf3 Remove dmesg_restrict
dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.

Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .

Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
2014-05-27 16:51:11 -07:00
Mark Salyzyn
1e4cfe0636 am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"
* commit '5df557f6b05ebde2e3f98affa54ef60b717d4b96':
  logd: logcat: debuggerd: audit logs to events and main
2014-05-27 22:55:35 +00:00