From b8d6a64f7a61e856629921c3015fff15e7051e0f Mon Sep 17 00:00:00 2001
From: Martin Foo <i25ffz@hotmail.com>
Date: Tue, 14 Oct 2014 20:24:09 +0800
Subject: [PATCH] Compatibility ndk r9d armeabi-v7a-hard APP_ABI building.

---
 android/jni/Android.mk | 3 ++-
 android/jni/Locals.mk  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 90df331681..7a33723437 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -51,7 +51,8 @@ ARCH_FILES := \
   $(SRC)/GPU/Common/VertexDecoderX86.cpp
 endif
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
 ARCH_FILES := \
   $(SRC)/GPU/Common/TextureDecoderNEON.cpp.neon \
   $(SRC)/Common/ArmEmitter.cpp \
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index f3608378d8..d2844bafba 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -17,7 +17,8 @@ LOCAL_C_INCLUDES := \
 LOCAL_STATIC_LIBRARIES := native libzip
 LOCAL_LDLIBS := -lz -lGLESv2 -lEGL -ldl -llog
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavformat.a
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavcodec.a
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libswresample.a