commit f77d156168496b9793d893980123efd0ad38d5ee
author Artem Serov <artem.serov@linaro.org> Mon Aug 08 15:14:18 2016 +0100
committer Artem Serov <artem.serov@linaro.org> Fri Aug 19 15:53:04 2016 +0100
tree 9f06af1cf240eb851ee5a707d0688ebfa612b100
parent 12e097c84cef710fa4f254b1811ff70b876e9e9a

ARM: VIXL32: Switch JNI compiler to use VIXL Assembler.

Change-Id: I9f9ef1a9c9c9eb796d52980916e56e841aa52a0f

compiler/utils/jni_macro_assembler.cc

diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc
index 797a98c..4bbd275 100644
--- a/compiler/utils/jni_macro_assembler.cc
+++ b/compiler/utils/jni_macro_assembler.cc
@@ -20,7 +20,7 @@
 #include <vector>
 
 #ifdef ART_ENABLE_CODEGEN_arm
-#include "arm/jni_macro_assembler_arm.h"
+#include "arm/jni_macro_assembler_arm_vixl.h"
 #endif
 #ifdef ART_ENABLE_CODEGEN_arm64
 #include "arm64/jni_macro_assembler_arm64.h"
@@ -58,7 +58,7 @@
 #ifdef ART_ENABLE_CODEGEN_arm
     case kArm:
     case kThumb2:
-      return MacroAsm32UniquePtr(new (arena) arm::ArmJNIMacroAssembler(arena, instruction_set));
+      return MacroAsm32UniquePtr(new (arena) arm::ArmVIXLJNIMacroAssembler(arena));
 #endif
 #ifdef ART_ENABLE_CODEGEN_mips
     case kMips: