From 29143dec872c5cad98ec15dd92739a460b02abae Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Fri, 11 Nov 2022 19:17:11 +0100
Subject: [PATCH] util/SortList: kludge for Android NDK compatibility

---
 src/util/SortList.hxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/util/SortList.hxx b/src/util/SortList.hxx
index a60427eb7..0e13511b1 100644
--- a/src/util/SortList.hxx
+++ b/src/util/SortList.hxx
@@ -43,7 +43,11 @@
 template<typename List>
 constexpr void
 MergeList(List &dest, List &src,
-	  std::predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept
+#ifndef ANDROID
+	  /* Android NDK r25b has no std::predicate */
+	  std::predicate<typename List::const_reference, typename List::const_reference>
+#endif
+	  auto p) noexcept
 {
 	const auto dest_end = dest.end(), src_end = src.end();
 
@@ -85,7 +89,11 @@ MergeList(List &dest, List &src,
 template<typename List>
 constexpr void
 SortList(List &list,
-	 std::predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept
+#ifndef ANDROID
+	 /* Android NDK r25b has no std::predicate */
+	 std::predicate<typename List::const_reference, typename List::const_reference>
+#endif
+	 auto p) noexcept
 {
 	using std::swap;