ref: 61dae45fad6594954a9244b804d9a28c9ec76575
parent: 4f535e31e6a85b6ba1845a400a8a9176124ad0cc
parent: 506826a8aea6f056c7ec9f623a5e2cae8d58a98f
author: Licai Guo <[email protected]>
date: Thu Mar 6 04:07:26 EST 2014
Merge pull request #421 from mstorsjo/android-x86-build Fix building android on x86
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -1,4 +1,5 @@
ARCH = arm
+include build/platform-arch.mk
SHAREDLIBSUFFIX = so
GCCVERSION = 4.8
NDKLEVEL = 12
@@ -12,8 +13,6 @@
LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
APP_ABI = armeabi-v7a
ifeq (Yes, $(USE_ASM))
- ASM_ARCH = arm
- CFLAGS += -DHAVE_NEON
ASMFLAGS += -march=armv7-a -mfpu=neon
endif
else
@@ -21,9 +20,7 @@
GCCPREFIX = i686-linux-android
APP_ABI = x86
ifeq (Yes, $(USE_ASM))
- ASM_ARCH = x86
- CFLAGS += -DX86_ASM
- ASMFLAGS += -DNOPREFIX -f elf32 -DX86_32
+ ASMFLAGS += -DNOPREFIX -f elf32
endif
endif