Merge "LP64 should have debuggerd and debuggerd64."

2014-02-01 01:28:03 +00:00 · 2014-02-01 01:28:03 +00:00 · 434edbe6ff
parent 1bc6169f80 e9edf7a0ef
commit 434edbe6ff
2 changed files with 9 additions and 1 deletions
--- 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
--- 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