From 1851d57783b8bcb60684876b41ca9cd191d19a0d Mon Sep 17 00:00:00 2001 From: wsnipex Date: Sun, 25 Sep 2016 21:50:40 +0200 Subject: [android] fix packaging for aarch64 --- tools/android/packaging/Makefile.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index b53ca30ec4..3922df2a4d 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -34,8 +34,10 @@ ARCH=x86 CPU=x86 endif ifeq ($(findstring arm,$(CPU)),arm) -ARCH=arm -CPU=armeabi-v7a + ifneq ($(findstring arm64,$(CPU)),arm64) + ARCH=arm + CPU=armeabi-v7a +endif endif #older ndk x86 @@ -51,6 +53,10 @@ ifneq ($(shell test -f $(GDBPATH) && echo 1),1) GDBPATH=$(NDKROOT)/prebuilt/android-$(ARCH)/gdbserver/gdbserver endif +ifeq ($(ARCH),aarch64) +GDBPATH=$(NDKROOT)/prebuilt/android-arm64/gdbserver/gdbserver +endif + SRCLIBS = $(addprefix $(PREFIX)/lib/,$(OBJS)) $(addprefix $(PREFIX)/lib/$(SDK_PLATFORM)/,$(PLATFORM_OBJS)) DSTLIBS = $(CPU)/lib/lib@APP_NAME_LC@.so $(addprefix $(CPU)/lib/,$(OBJS)) $(addprefix $(CPU)/lib/,$(PLATFORM_OBJS)) libs= $(DSTLIBS) @@ -115,7 +121,7 @@ res: libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so rm -rf xbmc/lib/$(CPU) xbmc/libs/$(CPU) xbmc/obj/local/$(CPU) mkdir -p xbmc/lib/$(CPU) xbmc/assets/python2.7/lib/ xbmc/libs/$(CPU) xbmc/obj/local/$(CPU) - cp -fp $(SRCLIBS) xbmc/obj/local/$(CPU)/ + cp -fpL $(SRCLIBS) xbmc/obj/local/$(CPU)/ cp -fp $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so xbmc/obj/local/$(CPU)/ find $(PREFIX)/lib/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; find $(PREFIX)/share/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; -- cgit v1.2.3