summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-31 17:15:10 -0800
committerElliott Hughes <enh@google.com>2014-01-31 17:15:10 -0800
commite9edf7a0efd8c62dacab7bf765c8037d8a94c3bb (patch)
tree68588168a1606835347e12336b2e679cc42f18be
parent1bc6169f80fb02957695351ce8b4f49d0c019382 (diff)
downloadsystem_core-e9edf7a0efd8c62dacab7bf765c8037d8a94c3bb.zip
system_core-e9edf7a0efd8c62dacab7bf765c8037d8a94c3bb.tar.gz
system_core-e9edf7a0efd8c62dacab7bf765c8037d8a94c3bb.tar.bz2
LP64 should have debuggerd and debuggerd64.
Change-Id: I4e39c200e6867bb9a5bbcfec1c449b8864028feb
-rw-r--r--debuggerd/Android.mk6
-rw-r--r--include/cutils/debugger.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 189bfda..e0a2d96 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -19,7 +19,11 @@ LOCAL_CFLAGS := \
-Werror \
-Wno-unused-parameter \
-LOCAL_MODULE := debuggerd
+ifeq ($(TARGET_IS_64_BIT),true)
+ LOCAL_MODULE := debuggerd64
+else
+ LOCAL_MODULE := debuggerd
+endif
ifeq ($(ARCH_ARM_HAVE_VFP),true)
LOCAL_CFLAGS += -DWITH_VFP
diff --git a/include/cutils/debugger.h b/include/cutils/debugger.h
index 4eda523..af80e2c 100644
--- a/include/cutils/debugger.h
+++ b/include/cutils/debugger.h
@@ -23,7 +23,11 @@
extern "C" {
#endif
+#if __LP64__
+#define DEBUGGER_SOCKET_NAME "android:debuggerd64"
+#else
#define DEBUGGER_SOCKET_NAME "android:debuggerd"
+#endif
typedef enum {
// dump a crash