summaryrefslogtreecommitdiff
path: root/debuggerd/Android.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-05-22 14:26:13 -0700
committerChristopher Ferris <cferris@google.com>2015-05-27 17:21:38 -0700
commite8bc77eb845ab5557a4c98fe0da604d4a3740bef (patch)
treea2e19db2503de6abcfc6926c57b6920bdde14ddf /debuggerd/Android.mk
parent7c7895755cf23140f08b7416ceff006dbbf7a411 (diff)
Refactor dump_memory function.
- Add dumping memory around registers for x86/x86_64. - Add unit tests for new dump_memory function. - Cleanup all of the machine.cpp files. - Increase the high address check for 32 bit, and decrease the high address allowed for 64 bit slightly to match mips64. Bug: 21206576 Change-Id: I6f75141f3282db48b10f7c695a1cf2eb75a08351
Diffstat (limited to 'debuggerd/Android.mk')
-rw-r--r--debuggerd/Android.mk60
1 files changed, 54 insertions, 6 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index dd532964d..1a5f05e35 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -1,4 +1,12 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+
+common_cppflags := \
+ -std=gnu++11 \
+ -W \
+ -Wall \
+ -Wextra \
+ -Wunused \
+ -Werror \
include $(CLEAR_VARS)
@@ -17,11 +25,7 @@ LOCAL_SRC_FILES_mips64 := mips64/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 \
+LOCAL_CPPFLAGS := $(common_cppflags)
ifeq ($(TARGET_IS_64_BIT),true)
LOCAL_CPPFLAGS += -DTARGET_IS_64_BIT
@@ -70,3 +74,47 @@ LOCAL_MODULE_STEM_64 := crasher64
LOCAL_MULTILIB := both
include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ utility.cpp \
+ test/dump_memory_test.cpp \
+ test/log_fake.cpp \
+
+LOCAL_MODULE := debuggerd_test
+
+LOCAL_SHARED_LIBRARIES := \
+ libbacktrace \
+ libbase \
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/test
+LOCAL_CPPFLAGS := $(common_cppflags)
+
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+LOCAL_MULTILIB := both
+
+include $(BUILD_HOST_NATIVE_TEST)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ utility.cpp \
+ test/dump_memory_test.cpp \
+ test/log_fake.cpp \
+
+LOCAL_MODULE := debuggerd_test
+
+LOCAL_SHARED_LIBRARIES := \
+ libbacktrace \
+ libbase \
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/test
+LOCAL_CPPFLAGS := $(common_cppflags)
+
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+LOCAL_MULTILIB := both
+
+include $(BUILD_NATIVE_TEST)