diff options
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 |