commit 642331b5dd5647e7d196ac4f44406fd435478a56
author Elliott Hughes <enh@google.com> Wed Mar 06 15:03:53 2013 -0800
committer Elliott Hughes <enh@google.com> Wed Mar 06 15:03:53 2013 -0800
tree 82c71032c0a4b14a87c0f2c579f1aa949aa8bc0c
parent 0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c

Fix debug malloc.

This was broken by the change to use AT_RANDOM for the stack guards.

Bug: 7959813
Bug: 8330764
Change-Id: I791900092b72a9a900f16585237fa7ad82aaed9f

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 884d759..4470efa 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -736,7 +736,7 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp bionic/__stack_chk_guard.cpp
+LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp
 LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libbionic_ssp