diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2018-09-24 16:29:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 16:29:08 +0200 |
| commit | 1c1ed9d2855165c4e4ed7339dfc5ba60088d9d07 (patch) | |
| tree | 4317257c7f5e752190c78570390495104e9e7581 /tools/android | |
| parent | 6048c2cd9249c3113cb20a5226d9e97b6e6a8648 (diff) | |
| parent | ce328e95df78f73303052571d46018b6e64cb153 (diff) | |
Merge pull request #14463 from Rechi/android/ndk18
[android] use ndk 18
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/packaging/Makefile.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index d3987ec237..07776ce320 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -45,6 +45,10 @@ endif # libc++ STLLIB=$(TOOLCHAIN)/$(HOST)/lib/libc++_shared.so +# https://android.googlesource.com/platform/ndk/+/fe0fe5dc32682d1811d32492c3055becb512c147/build/tools/make_standalone_toolchain.py#308 +ifeq ($(findstring armeabi-v7a,$(CPU)),armeabi-v7a) + STLLIB=$(TOOLCHAIN)/$(HOST)/lib/armv7-a/libc++_shared.so +endif #older ndk x86 GDBPATH=$(NDKROOT)/toolchains/$(ARCH)-$(GCC_VERSION)/prebuilt/gdbserver |