commit fb7eb5e07f43587c2bedf2aaa53b21fa002417bb
author Elliott Hughes <enh@google.com> Thu Feb 14 14:37:34 2013 -0800
committer Elliott Hughes <enh@google.com> Thu Feb 14 14:37:34 2013 -0800
tree 2854e0357877216fe1d7e8722085a561b22b123b
parent c2d26ce7452e69b9492cd28b7c0271866798658b

Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.

Bug: 2487269
Change-Id: Iec5e470fc22cd9108404f634a9d4baa2c7b7f58f

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index f78cf2c..83d8e59 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -725,7 +725,7 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := bionic/ssp.cpp
+LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp bionic/__stack_chk_guard.cpp
 LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libbionic_ssp