aboutsummaryrefslogtreecommitdiff
path: root/tools/android
diff options
context:
space:
mode:
authorChris "Koying" Browet <cbro@semperpax.com>2017-12-23 13:21:36 +0100
committerChris "Koying" Browet <cbro@semperpax.com>2017-12-23 15:27:11 +0100
commit07160d949bf538401213f38cc5d19c79a76006e2 (patch)
tree94d61647d7b64c92ccbf4cc4af073d475d2519c0 /tools/android
parentf55053830f09a631c86fb0251deac5bdc6f04805 (diff)
FIX: [droid] allow to build on non-libc++ toolchains
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/packaging/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index af990bb593..6f91b9cbfa 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -147,7 +147,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@
cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/
$(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so
- install -p $(STLLIB) ./xbmc/lib/$(CPU)/
+ (test -s $(STLLIB) && install -p $(STLLIB) ./xbmc/lib/$(CPU)/) || true
install -p $(GDBPATH) ./xbmc/lib/$(CPU)/gdbserver
echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/lib/$(CPU)/gdb.setup
echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \