From e9edf7a0efd8c62dacab7bf765c8037d8a94c3bb Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 31 Jan 2014 17:15:10 -0800
Subject: [PATCH] LP64 should have debuggerd and debuggerd64.

Change-Id: I4e39c200e6867bb9a5bbcfec1c449b8864028feb
---
 debuggerd/Android.mk      | 6 +++++-
 include/cutils/debugger.h | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 189bfda64..e0a2d9659 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 4eda5237b..af80e2ccf 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