diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-04 00:11:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 00:11:51 +0000 |
| commit | 3c9f410e1679fe42257872e98ffa544ca0cdd691 (patch) | |
| tree | 1cd9a0bed6a0007bd5b57dd15437acbb29c6ac52 /debuggerd | |
| parent | 520a893b1a76598ac82cbbec2c8e5f36adfaa3af (diff) | |
| parent | 0d31d4877ca451c9e15a0651ab2b4827556afeff (diff) | |
| download | system_core-3c9f410e1679fe42257872e98ffa544ca0cdd691.zip system_core-3c9f410e1679fe42257872e98ffa544ca0cdd691.tar.gz system_core-3c9f410e1679fe42257872e98ffa544ca0cdd691.tar.bz2 | |
am 0d31d487: am d3b61d18: Merge "Clean up the debuggerd makefile."
* commit '0d31d4877ca451c9e15a0651ab2b4827556afeff':
Clean up the debuggerd makefile.
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/Android.mk | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk index 8be3541..ad2cc5c 100644 --- a/debuggerd/Android.mk +++ b/debuggerd/Android.mk @@ -3,11 +3,11 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - backtrace.cpp \ - debuggerd.cpp \ - getevent.cpp \ - tombstone.cpp \ - utility.cpp \ + backtrace.cpp \ + debuggerd.cpp \ + getevent.cpp \ + tombstone.cpp \ + utility.cpp \ LOCAL_SRC_FILES_arm := arm/machine.cpp LOCAL_SRC_FILES_arm64 := arm64/machine.cpp @@ -15,12 +15,11 @@ LOCAL_SRC_FILES_mips := mips/machine.cpp LOCAL_SRC_FILES_x86 := x86/machine.cpp LOCAL_SRC_FILES_x86_64 := x86_64/machine.cpp -LOCAL_CONLYFLAGS := -std=gnu99 -LOCAL_CPPFLAGS := -std=gnu++11 -LOCAL_CFLAGS := \ - -Wall \ - -Wno-array-bounds \ - -Werror +LOCAL_CPPFLAGS := \ + -std=gnu++11 \ + -W -Wall -Wextra \ + -Wunused \ + -Werror \ ifeq ($(ARCH_ARM_HAVE_VFP),true) LOCAL_CFLAGS_arm += -DWITH_VFP @@ -30,11 +29,10 @@ LOCAL_CFLAGS_arm += -DWITH_VFP_D32 endif # ARCH_ARM_HAVE_VFP_D32 LOCAL_SHARED_LIBRARIES := \ - libbacktrace \ - libc \ - libcutils \ - liblog \ - libselinux \ + libbacktrace \ + libcutils \ + liblog \ + libselinux \ include external/stlport/libstlport.mk @@ -42,6 +40,7 @@ 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) |