android/build.py: link ARMv7 binary with libunwind

Fixes nullptr dereference when an exception gets thrown because there is no ".eh_frame" section for unwinding. Closes https://github.com/MusicPlayerDaemon/MPD/issues/543

android/build.py: link ARMv7 binary with libunwind
36dec47b · Max Kellermann · 478cedca · 36dec47b · 36dec47b
Commit 36dec47b authored May 03, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

NEWS NEWS +2 -0

build.py android/build.py +6 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.9 (not yet released)
+* Android
+  - fix crash on ARMv7

 ver 0.21.8 (2019/04/23)
 * input

--- a/android/build.py
+++ b/android/build.py
@@ -138,6 +138,12 @@ class AndroidNdkToolchain:
        libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
        libstdcxx_libs = '-lc++_static -lc++abi'

+        if self.is_armv7:
+            # On 32 bit ARM, clang generates no ".eh_frame" section;
+            # instead, the LLVM unwinder library is used for unwinding
+            # the stack after a C++ exception was thrown
+            libstdcxx_libs += ' -lunwind'
+
        if use_cxx:
            self.cxxflags += ' ' + libstdcxx_cxxflags
            self.ldflags += ' ' + libstdcxx_ldflags