summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-03-04 16:52:43 -0800
committerSteve Kondik <shade@chemlab.org>2014-03-04 16:52:43 -0800
commit2bdcb87365009cd68fe441b3c3e471de2f6608e1 (patch)
treebb9671dd3ec5509e59c42be3b33299ea76aca436
parenta2cad27c7e2f5ebf6474583123346c0813b45fa9 (diff)
downloadbionic-2bdcb87365009cd68fe441b3c3e471de2f6608e1.zip
bionic-2bdcb87365009cd68fe441b3c3e471de2f6608e1.tar.gz
bionic-2bdcb87365009cd68fe441b3c3e471de2f6608e1.tar.bz2
libc: Fix memchr inclusion
Change-Id: I6f374f16b08e19851a375a4abad3e8235f8da59c
-rw-r--r--libc/Android.mk1
-rw-r--r--libc/arch-arm/krait/krait.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index 8850c1e..1b02b78 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -370,7 +370,6 @@ libc_common_src_files += \
string/strncpy.c \
bionic/strchr.cpp \
string/strrchr.c \
- bionic/memchr.c \
bionic/memrchr.c \
string/index.c \
bionic/strnlen.c \
diff --git a/libc/arch-arm/krait/krait.mk b/libc/arch-arm/krait/krait.mk
index d1f0608..868ad4c 100644
--- a/libc/arch-arm/krait/krait.mk
+++ b/libc/arch-arm/krait/krait.mk
@@ -14,4 +14,4 @@ $(call libc-add-cpu-variant-src,STRCAT,arch-arm/cortex-a15/bionic/strcat.S)
$(call libc-add-cpu-variant-src,STRCPY,arch-arm/cortex-a15/bionic/strcpy.S)
$(call libc-add-cpu-variant-src,STRLEN,arch-arm/cortex-a15/bionic/strlen.S)
-#include bionic/libc/arch-arm/generic/generic.mk
+include bionic/libc/arch-arm/generic/generic.mk