diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-10 11:36:17 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-10 11:36:17 -0700 |
| commit | 8793e7c7d21a0434d1b5e63364c88b2b125a3d29 (patch) | |
| tree | a515a4be8d2881d734a6b1c2a2e4f1fdd0c43e1d /libc/Android.mk | |
| parent | be1d78b0dc899a732c0e9d7515d3023e8004e368 (diff) | |
| download | bionic-8793e7c7d21a0434d1b5e63364c88b2b125a3d29.zip bionic-8793e7c7d21a0434d1b5e63364c88b2b125a3d29.tar.gz bionic-8793e7c7d21a0434d1b5e63364c88b2b125a3d29.tar.bz2 | |
Revert "Switch to NetBSD's strxfrm(3)."
This reverts commit be1d78b0dc899a732c0e9d7515d3023e8004e368
Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 091b066..fd81d7e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -209,6 +209,7 @@ libc_common_src_files := \ string/strstr.c \ string/strtok.c \ string/strtotimeval.c \ + string/strxfrm.c \ string/__memcpy_chk.c \ string/__memmove_chk.c \ string/__memset_chk.c \ @@ -336,7 +337,6 @@ libc_common_src_files := \ regex/regerror.c \ regex/regexec.c \ regex/regfree.c \ - upstream-netbsd/libc/string/strxfrm.c \ # The following files are common, but must be compiled # with different C flags when building a static C library. @@ -467,9 +467,6 @@ libc_common_cflags := \ -DLOG_ON_HEAP_ERROR \ -std=gnu99 -libc_common_cflags += \ - -include upstream-netbsd/netbsd-compat.h - # these macro definitions are required to implement the # 'timezone' and 'daylight' global variables, as well as # properly update the 'tm_gmtoff' field in 'struct tm'. |