diff options
| author | Max Kellermann <max@musicpd.org> | 2018-10-23 20:10:57 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-10-23 20:10:57 +0200 |
| commit | c2a2573aa5ed2d5e875c6b5f0cf84e7e940bbfa4 (patch) | |
| tree | 57198837fcf65f57c65615738baa2d7c218539e1 /android | |
| parent | 66ab2de5785755594b300b933083a0e5892d05fc (diff) | |
| parent | 9274bc15bc41bbe490fde847f8422468cc20375d (diff) | |
Merge tag 'v0.20.22'
release v0.20.22
Diffstat (limited to 'android')
| -rwxr-xr-x | android/build.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/build.py b/android/build.py index dd8b74d23..842784d49 100755 --- a/android/build.py +++ b/android/build.py @@ -133,13 +133,15 @@ class AndroidNdkToolchain: libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++') libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi) - libstdcxx_flags = '-stdlib=libc++' + libstdcxx_flags = '' libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include') - libstdcxx_ldflags = libstdcxx_flags + ' -static-libstdc++ -L' + libcxx_libs_path + libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path + libstdcxx_libs = '-lc++_static -lc++abi' if use_cxx: self.cxxflags += ' ' + libstdcxx_cxxflags self.ldflags += ' ' + libstdcxx_ldflags + self.libs += ' ' + libstdcxx_libs self.env = dict(os.environ) |