summaryrefslogtreecommitdiff
path: root/debuggerd/Android.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-01-10 16:05:12 -0800
committerChristopher Ferris <cferris@google.com>2014-01-10 16:05:12 -0800
commitd607495b892fe6ffa1cd30eaad114eec97d77681 (patch)
tree76e9a713373ced70dd17c884d499b83c5e54249e /debuggerd/Android.mk
parent261ff50e32b2b2a41bd3993c37abb5a9a94e431b (diff)
Move to C++ for debuggerd.
This is part 1, only including the bare minimum changes because our diff tool doesn't easily show differences when a file moves. This also breaks it into a small chunk in case some other changes break things, as unlikely as I think that will be. Change-Id: Ib7a3e7a2cc1ac574d15b65fda23813ebcf5d31af
Diffstat (limited to 'debuggerd/Android.mk')
-rw-r--r--debuggerd/Android.mk26
1 files changed, 17 insertions, 9 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 2fe7c7aa9..422a86aab 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -6,14 +6,20 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- backtrace.c \
- debuggerd.c \
- getevent.c \
- tombstone.c \
- utility.c \
- $(TARGET_ARCH)/machine.c
-
-LOCAL_CFLAGS := -Wall -Wno-unused-parameter -std=gnu99
+ backtrace.cpp \
+ debuggerd.cpp \
+ getevent.cpp \
+ tombstone.cpp \
+ utility.cpp \
+ $(TARGET_ARCH)/machine.cpp \
+
+LOCAL_CONLYFLAGS := -std=gnu99
+LOCAL_CPPFLAGS := -std=gnu++11
+LOCAL_CFLAGS := \
+ -Wall \
+ -Wno-array-bounds \
+ -Werror \
+
LOCAL_MODULE := debuggerd
ifeq ($(ARCH_ARM_HAVE_VFP),true)
@@ -30,6 +36,8 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libselinux \
+include external/stlport/libstlport.mk
+
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
@@ -38,7 +46,7 @@ LOCAL_SRC_FILES += $(TARGET_ARCH)/crashglue.S
LOCAL_MODULE := crasher
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -fstack-protector-all
+LOCAL_CFLAGS += -fstack-protector-all -Wno-unused-parameter -Wno-free-nonheap-object
#LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_EXECUTABLE)