diff options
| author | Kenny Root <kroot@google.com> | 2012-10-17 09:57:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 09:57:10 -0700 |
| commit | 2a36ae5608e9d655b2bb14ce538f6fbdb910cada (patch) | |
| tree | 811fdedb31aaded259b150b91e704cf97a0233b0 /debuggerd | |
| parent | 20f5daa8653eb2d81af8c161a2084e3b53ec3914 (diff) | |
| parent | 7b88a90da2a27e347fc16c14fa577f4ae1ef07fd (diff) | |
| download | system_core-2a36ae5608e9d655b2bb14ce538f6fbdb910cada.zip system_core-2a36ae5608e9d655b2bb14ce538f6fbdb910cada.tar.gz system_core-2a36ae5608e9d655b2bb14ce538f6fbdb910cada.tar.bz2 | |
am 7b88a90d: Merge "Remove HAVE_SELINUX guards"
* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
Remove HAVE_SELINUX guards
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/Android.mk | 12 | ||||
| -rw-r--r-- | debuggerd/tombstone.c | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk index 15083f4..e48b9af 100644 --- a/debuggerd/Android.mk +++ b/debuggerd/Android.mk @@ -23,13 +23,11 @@ ifeq ($(ARCH_ARM_HAVE_VFP_D32),true) LOCAL_CFLAGS += -DWITH_VFP_D32 endif # ARCH_ARM_HAVE_VFP_D32 -LOCAL_SHARED_LIBRARIES := libcutils libc libcorkscrew - -ifeq ($(HAVE_SELINUX),true) -LOCAL_SHARED_LIBRARIES += libselinux -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_CFLAGS += -DHAVE_SELINUX -endif +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libc \ + libcorkscrew \ + libselinux include $(BUILD_EXECUTABLE) diff --git a/debuggerd/tombstone.c b/debuggerd/tombstone.c index 592f4f2..5feabe5 100644 --- a/debuggerd/tombstone.c +++ b/debuggerd/tombstone.c @@ -35,9 +35,7 @@ #include <corkscrew/demangle.h> #include <corkscrew/backtrace.h> -#ifdef HAVE_SELINUX #include <selinux/android.h> -#endif #include "machine.h" #include "tombstone.h" @@ -696,12 +694,10 @@ char* engrave_tombstone(pid_t pid, pid_t tid, int signal, mkdir(TOMBSTONE_DIR, 0755); chown(TOMBSTONE_DIR, AID_SYSTEM, AID_SYSTEM); -#ifdef HAVE_SELINUX if (selinux_android_restorecon(TOMBSTONE_DIR) == -1) { *detach_failed = false; return NULL; } -#endif int fd; char* path = find_and_open_tombstone(&fd); |