Fix warnings (and errors) in static inline headers.
Bug: http://b/31676510
Change-Id: Idcbc544e498f7e6bbe99c2bf7dc557a5681e96c4
Test: preupload hook
diff --git a/libc/include/string.h b/libc/include/string.h
index b945883..8ad227b 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -114,8 +114,12 @@
int strcoll(const char* _Nonnull, const char* _Nonnull) __purefunc;
size_t strxfrm(char* __restrict, const char* _Nonnull __restrict, size_t);
+#if __ANDROID_API__ >= 21
int strcoll_l(const char* _Nonnull, const char* _Nonnull, locale_t) __purefunc __INTRODUCED_IN(21);
size_t strxfrm_l(char* __restrict, const char* _Nonnull __restrict, size_t, locale_t) __INTRODUCED_IN(21);
+#else
+// Implemented as static inlines before 21.
+#endif
#if defined(__USE_GNU) && !defined(basename)
/*