9774df6134
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
71 lines
1.7 KiB
Makefile
71 lines
1.7 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
backtrace.cpp \
|
|
debuggerd.cpp \
|
|
getevent.cpp \
|
|
tombstone.cpp \
|
|
utility.cpp \
|
|
|
|
LOCAL_SRC_FILES_arm := arm/machine.cpp
|
|
LOCAL_SRC_FILES_arm64 := arm64/machine.cpp
|
|
LOCAL_SRC_FILES_mips := mips/machine.cpp
|
|
LOCAL_SRC_FILES_mips64 := mips/machine.cpp
|
|
LOCAL_SRC_FILES_x86 := x86/machine.cpp
|
|
LOCAL_SRC_FILES_x86_64 := x86_64/machine.cpp
|
|
|
|
LOCAL_CPPFLAGS := \
|
|
-std=gnu++11 \
|
|
-W -Wall -Wextra \
|
|
-Wunused \
|
|
-Werror \
|
|
|
|
ifeq ($(TARGET_IS_64_BIT),true)
|
|
LOCAL_CPPFLAGS += -DTARGET_IS_64_BIT
|
|
endif
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbacktrace \
|
|
libcutils \
|
|
liblog \
|
|
libselinux \
|
|
|
|
LOCAL_CLANG := true
|
|
|
|
LOCAL_MODULE := debuggerd
|
|
LOCAL_MODULE_STEM_32 := debuggerd
|
|
LOCAL_MODULE_STEM_64 := debuggerd64
|
|
LOCAL_MULTILIB := both
|
|
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
|
|
|
|
include $(BUILD_EXECUTABLE)
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_SRC_FILES := crasher.c
|
|
LOCAL_SRC_FILES_arm := arm/crashglue.S
|
|
LOCAL_SRC_FILES_arm64 := arm64/crashglue.S
|
|
LOCAL_SRC_FILES_mips := mips/crashglue.S
|
|
LOCAL_SRC_FILES_mips64 := mips/crashglue.S
|
|
LOCAL_SRC_FILES_x86 := x86/crashglue.S
|
|
LOCAL_SRC_FILES_x86_64 := x86_64/crashglue.S
|
|
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_CFLAGS += -fstack-protector-all -Werror -Wno-free-nonheap-object
|
|
#LOCAL_FORCE_STATIC_EXECUTABLE := true
|
|
LOCAL_SHARED_LIBRARIES := libcutils liblog libc
|
|
|
|
# The arm emulator has VFP but not VFPv3-D32.
|
|
ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)
|
|
LOCAL_ASFLAGS_arm += -DHAS_VFP_D32
|
|
endif
|
|
|
|
LOCAL_MODULE := crasher
|
|
LOCAL_MODULE_STEM_32 := crasher
|
|
LOCAL_MODULE_STEM_64 := crasher64
|
|
LOCAL_MULTILIB := both
|
|
|
|
include $(BUILD_EXECUTABLE)
|