From 6d8b09586534a3d27c5996ae9e3c5db658f7dd6f Mon Sep 17 00:00:00 2001 From: l3iggs Date: Sun, 17 Aug 2014 21:16:01 -0700 Subject: [PATCH 1/2] [Android] allow variable ABI targets --- android/phoenix/jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/phoenix/jni/Application.mk b/android/phoenix/jni/Application.mk index 2466e00247..f3a006487a 100644 --- a/android/phoenix/jni/Application.mk +++ b/android/phoenix/jni/Application.mk @@ -3,4 +3,4 @@ ifeq ($(GLES),3) else APP_PLATFORM := android-9 endif -APP_ABI := armeabi-v7a mips x86 +APP_ABI := $(TARGET_ABIS) From 3bd0812d854108577490112c4a1fa98a2a1b2cd8 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Sun, 17 Aug 2014 23:11:01 -0700 Subject: [PATCH 2/2] [Android] set default target ABI --- android/phoenix/jni/Application.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/phoenix/jni/Application.mk b/android/phoenix/jni/Application.mk index f3a006487a..ae50f31341 100644 --- a/android/phoenix/jni/Application.mk +++ b/android/phoenix/jni/Application.mk @@ -3,4 +3,9 @@ ifeq ($(GLES),3) else APP_PLATFORM := android-9 endif -APP_ABI := $(TARGET_ABIS) + +ifndef TARGET_ABIS + APP_ABI := armeabi-v7a mips x86 +else + APP_ABI := $(TARGET_ABIS) +endif