From 68349bc55c736c75685154c1cb6d95f3bc6baf18 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 7 May 2020 13:48:42 +0200
Subject: [PATCH] android/build.py: use -mfpu=vfpv3-d16 on ARMv7

This flag is used by the Android NDK build scripts as well, and this
fixes a build failure (assembler error) with FFmpeg and NDK r21.
---
 NEWS             | 1 +
 android/build.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d3e275df3..35b762de3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.21.24 (not yet released)
 * database
   - simple: fix crash when mounting twice
 * fix unit test failure
+* fix build failure with Android NDK r21
 
 ver 0.21.23 (2020/04/23)
 * protocol
diff --git a/android/build.py b/android/build.py
index 63e57f93e..7fb90173f 100755
--- a/android/build.py
+++ b/android/build.py
@@ -26,7 +26,7 @@ android_abis = {
         'ndk_arch': 'arm',
         'toolchain_arch': 'arm-linux-androideabi',
         'llvm_triple': 'armv7-linux-androideabi',
-        'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
+        'cflags': '-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp',
     },
 
     'arm64-v8a': {