Repositories
/
olsrd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c953b70
)
android: fix build on 32 bit platform (see 0295e11)
author
Ferry Huberts
<ferry.huberts@pelagic.nl>
Fri, 22 Aug 2014 10:32:29 +0000
(12:32 +0200)
committer
Ferry Huberts
<ferry.huberts@pelagic.nl>
Thu, 16 Oct 2014 10:20:16 +0000
(12:20 +0200)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
make/Makefile.android
patch
|
blob
|
history
diff --git
a/make/Makefile.android
b/make/Makefile.android
index
b6e2b34
..
0cd5065
100644
(file)
--- a/
make/Makefile.android
+++ b/
make/Makefile.android
@@
-96,6
+96,9
@@
UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
NDK_BASE ?= /opt/android-ndk
NDK_PLATFORM_LEVEL ?= 4
NDK_ARCH=$(shell uname -m)
+ifneq ($(NDK_ARCH),x86_64)
+NDK_ARCH=x86
+endif
NDK_ABI=arm
NDK_ABIDIR=linux-androideabi
NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)