commit | b95ad82f7d175a4f79eb0cbf6caedf0653603590 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Oct 02 11:31:30 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 11:31:30 2012 -0700 |
tree | 9579c161e3d39f01adf604de1b6d626029b72499 | |
parent | 90172541866696a5a46fae7ff7e186126ee37318 [diff] | |
parent | 95a2a7f325330830d6227aa683948b325e38e653 [diff] |
am 95a2a7f3: Merge "Fix MIPS build." * commit '95a2a7f325330830d6227aa683948b325e38e653': Fix MIPS build.
diff --git a/libc/Android.mk b/libc/Android.mk index 73b8acb..cd44f23 100644 --- a/libc/Android.mk +++ b/libc/Android.mk
@@ -479,8 +479,8 @@ arch-mips/string/mips_strlen.c libc_common_src_files += \ + bionic/memcmp.c \ string/bcopy.c \ - string/memcmp.c \ string/strcmp.c \ string/strcpy.c \ string/strncmp.c