From 312fcab8b0b2ee4afad9f74c7cfe6935d198769a Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 26 Dec 2015 20:35:49 -0800
Subject: [PATCH] Fix unittest build on Android x86.

---
 android/jni/Android.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index f44521c4aa..a4cdbbaa34 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -444,8 +444,18 @@ ifeq ($(UNITTEST),1)
 
   ifeq ($(findstring arm64-v8a,$(TARGET_ARCH_ABI)),arm64-v8a)
     TESTARMEMITTER_FILE = $(SRC)/unittest/TestArm64Emitter.cpp
-  else
+  else ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
     TESTARMEMITTER_FILE = $(SRC)/unittest/TestArmEmitter.cpp
+  else
+    TESTARMEMITTER_FILE = \
+      $(SRC)/Common/ArmEmitter.cpp \
+      $(SRC)/Common/Arm64Emitter.cpp \
+      $(SRC)/Core/MIPS/ARM/ArmRegCacheFPU.cpp \
+      $(SRC)/Core/Util/DisArm64.cpp \
+      $(SRC)/ext/disarm.cpp \
+      $(SRC)/unittest/TestArmEmitter.cpp \
+      $(SRC)/unittest/TestArm64Emitter.cpp \
+      $(SRC)/unittest/TestX64Emitter.cpp
   endif
 
   LOCAL_MODULE := ppsspp_unittest