summaryrefslogtreecommitdiffstats
path: root/debuggerd/Android.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-01-15 14:47:36 -0800
committerChristopher Ferris <cferris@google.com>2015-01-20 17:22:07 -0800
commit9774df613409c91f01ced1483bc01f42f6b4bf63 (patch)
tree3da5f40e44d496b2b9278d0cd2ab6b0ebce454e9 /debuggerd/Android.mk
parent45c4c06ffe6f38e0f77f37f488e07f2537eddd45 (diff)
downloadsystem_core-9774df613409c91f01ced1483bc01f42f6b4bf63.zip
system_core-9774df613409c91f01ced1483bc01f42f6b4bf63.tar.gz
system_core-9774df613409c91f01ced1483bc01f42f6b4bf63.tar.bz2
Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone try and directly contact the correct debuggerd (32 bit vs 64 bit) by reading the elf information for the executable. Unfortunately, system_server makes a call to dump_backtrace_to_file and it doesn't have permissions to read the executable data, so it defaults to always contacting the 64 bit debuggerd. This CL changes the code so that all dump requests go to the 64 bit debuggerd, which reads the elf information and redirects requests for 32 bit processes to the 32 bit debuggerd. Testing: - Forced the watchdog code in system_server to dump stacks and verified that all native stacks are dumped correctly. - Verified that dumpstate and bugreport still properly dump the native processes on a 64 bit and 32 bit system. - Intentionally forced the 64 bit to 32 bit redirect to write only a byte at a time and verified there are no errors, and no dropped data. - Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes seemlessly. - Used debuggerd on a 32 bit system to dump native stacks. Bug: https://code.google.com/p/android/issues/detail?id=97024 Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
Diffstat (limited to 'debuggerd/Android.mk')
-rw-r--r--debuggerd/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 0cf2818..fbaac39 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -22,6 +22,10 @@ LOCAL_CPPFLAGS := \
-Wunused \
-Werror \
+ifeq ($(TARGET_IS_64_BIT),true)
+LOCAL_CPPFLAGS += -DTARGET_IS_64_BIT
+endif
+
LOCAL_SHARED_LIBRARIES := \
libbacktrace \
libcutils \