commit c6b38aefa71b773d4b077ba2db2af7c3604b9cd6
author Elliott Hughes <enh@google.com> Fri Nov 22 11:15:42 2019 -0800
committer Elliott Hughes <enh@google.com> Fri Nov 22 11:16:23 2019 -0800
tree 782074f038c271448de7624fa4a5aee0cdb97c81
parent 1134b695bc3e8b7cdebf4d7d8238a58891a09045

Sync with upstream OpenBSD strstr().

Bug: http://b/124855136
Test: treehugger
Change-Id: I6cbeb82bc0e418f50e6c171ac4e38e335c448db8

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index cdbdf63..26cd3a3 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -536,7 +536,6 @@
         "upstream-openbsd/lib/libc/string/strpbrk.c",
         "upstream-openbsd/lib/libc/string/strsep.c",
         "upstream-openbsd/lib/libc/string/strspn.c",
-        "upstream-openbsd/lib/libc/string/strstr.c",
         "upstream-openbsd/lib/libc/string/strtok.c",
         "upstream-openbsd/lib/libc/string/strxfrm.c",
         "upstream-openbsd/lib/libc/string/wcslcpy.c",
@@ -564,6 +563,7 @@
     srcs: [
         "stdio/vfprintf.cpp",
         "stdio/vfwprintf.cpp",
+        "upstream-openbsd/lib/libc/string/strstr.c",
     ],
     cflags: [
         "-include openbsd-compat.h",