ref: 6d9dfe8954dc1455f120a9e8c9088a67fd880816
parent: e99df3377d7dabd2696767e2fd39e1a54ba5b401
parent: 918af275602daa4fc05fc9db5d7eac16a7639402
author: Licai Guo <[email protected]>
date: Mon Mar 10 13:20:58 EDT 2014
Merge pull request #454 from mstorsjo/android-any-arch Support building for any other android architecture
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -11,12 +11,15 @@
ifeq (Yes, $(USE_ASM))
ASMFLAGS += -march=armv7-a -mfpu=neon
endif
-else
+else ifeq ($(ARCH), x86)
APP_ABI = x86
TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=x86)
ifeq (Yes, $(USE_ASM))
ASMFLAGS += -DNOPREFIX -f elf32
endif
+else
+ APP_ABI = $(ARCH)
+ TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))
endif
ifndef NDKROOT