ref: 04f066ae7c6f3feee3259480660b7b5060a424fe
parent: 9aaeef92645b753d4fca7db5a4f112fd02742304
author: Martin Storsjö <martin@martin.st>
date: Wed Jul 16 17:05:15 EDT 2014
Add support for building for the new 64 bit android ABIs This requires the new NDK r10. The mips64 ABI is handled by the default case, there's no need to add custom code for that in platform-android.mk.
--- a/README.md
+++ b/README.md
@@ -69,8 +69,8 @@
NDKLEVEL specifies android api level, the api level can be 12-19, the default is 12.
By default these commands build for the armeabi-v7a ABI. To build for the other android
-ABIs, add "ARCH=mips" or "ARCH=x86". To build for the older armeabi ABI (which has
-armv5te as baseline), add "APP_ABI=armeabi" (ARCH=arm is implicit).
+ABIs, add "ARCH=arm64", "ARCH=x86", "ARCH=x86_64", "ARCH=mips" or "ARCH=mips64".
+To build for the older armeabi ABI (which has armv5te as baseline), add "APP_ABI=armeabi" (ARCH=arm is implicit).
For iOS Builds
--------------
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -12,10 +12,17 @@
ifeq (Yes, $(USE_ASM))
ASMFLAGS += -march=armv7-a -mfpu=neon
endif
+else ifeq ($(ARCH), arm64)
+ APP_ABI = arm64-v8a
else ifeq ($(ARCH), x86)
APP_ABI = x86
ifeq (Yes, $(USE_ASM))
ASMFLAGS += -f elf32
+ endif
+else ifeq ($(ARCH), x86_64)
+ APP_ABI = x86_64
+ ifeq (Yes, $(USE_ASM))
+ ASMFLAGS += -f elf64
endif
else
APP_ABI = $(ARCH)