diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-01 01:39:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-01 01:39:18 +0000 |
| commit | 6cfb31d65255eacd7965295a561cafa1218dc842 (patch) | |
| tree | 6ea631dada1eab2d67b60c2479edcf6915f06047 | |
| parent | 19750a2c3088e19e37a2f4ad64ec93d91b3d7196 (diff) | |
| parent | 5cbb68cf891fa040563c70784363496cf3e05174 (diff) | |
| download | system_core-6cfb31d65255eacd7965295a561cafa1218dc842.zip system_core-6cfb31d65255eacd7965295a561cafa1218dc842.tar.gz system_core-6cfb31d65255eacd7965295a561cafa1218dc842.tar.bz2 | |
am 5cbb68cf: am da9b5dab: am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."
* commit '5cbb68cf891fa040563c70784363496cf3e05174':
LP64 should have debuggerd and debuggerd64.
| -rw-r--r-- | debuggerd/Android.mk | 6 | ||||
| -rw-r--r-- | include/cutils/debugger.h | 4 |
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 |