From 62988b2aa76b0efd685d766eeacaaf1bb611bd0d Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 26 Jun 2015 22:27:12 -0700
Subject: [PATCH] Fix building unittest for ARM64 Android.

---
 android/jni/Android.mk  | 8 +++++++-
 unittest/JitHarness.cpp | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index d75b4fb738..cf7ed1d512 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -430,13 +430,19 @@ ifeq ($(UNITTEST),1)
 	$(SRC)/ext/armips/Util/StringFormat.cpp \
 	$(SRC)/ext/armips/Util/Util.cpp
 
+  ifeq ($(findstring arm64-v8a,$(TARGET_ARCH_ABI)),arm64-v8a)
+    TESTARMEMITTER_FILE = $(SRC)/UnitTest/TestArm64Emitter.cpp
+  else
+    TESTARMEMITTER_FILE = $(SRC)/UnitTest/TestArmEmitter.cpp
+  endif
+
   LOCAL_MODULE := ppsspp_unittest
   LOCAL_SRC_FILES := \
 	$(LIBARMIPS_FILES) \
     $(EXEC_AND_LIB_FILES) \
 	$(SRC)/Core/MIPS/MIPSAsm.cpp \
     $(SRC)/UnitTest/JitHarness.cpp \
-    $(SRC)/UnitTest/TestArmEmitter.cpp \
+    $(TESTARMEMITTER_FILE) \
     $(SRC)/UnitTest/UnitTest.cpp
 
   include $(BUILD_EXECUTABLE)
diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp
index 27b842887d..da52347d94 100644
--- a/unittest/JitHarness.cpp
+++ b/unittest/JitHarness.cpp
@@ -176,8 +176,10 @@ bool TestJit() {
 		// Disassemble
 		JitBlockCache *cache = MIPSComp::jit->GetBlockCache();
 		JitBlock *block = cache->GetBlock(0);  // Should only be one block.
-#ifdef ARM
+#if defined(ARM)
 		std::vector<std::string> lines = DisassembleArm2(block->normalEntry, block->codeSize);
+#elif defined(ARM64)
+		std::vector<std::string> lines = DisassembleArm64(block->normalEntry, block->codeSize);
 #else
 		std::vector<std::string> lines = DisassembleX86(block->normalEntry, block->codeSize);
 #endif