From 49c8f903efea3e31cca115d4bc2ebb00b6463d7f Mon Sep 17 00:00:00 2001 From: Shoaib Meenai Date: Fri, 6 Jan 2023 23:35:15 -0800 Subject: [PATCH] [libc++] Fix aligned_alloc usage for Android Android only provides this function on API 28+; fix libc++ builds when targeting older API levels. Reviewed By: arichardson, #libc, philnik Differential Revision: https://reviews.llvm.org/D141184 --- libcxx/include/__config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libcxx/include/__config b/libcxx/include/__config index 1a519b9..505ccf9 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -741,6 +741,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500) # define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC # endif +# elif defined(__ANDROID__) && __ANDROID_API__ < 28 +// Android only provides aligned_alloc when targeting API 28 or higher. +# define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC # endif # if defined(__APPLE__) || defined(__FreeBSD__) -- 2.7.4