commit a073c67b8a0041c36bde419c509d1fd3864b7d6b
author Ian Rogers <irogers@google.com> Tue Jul 30 17:43:55 2013 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jul 30 18:03:07 2013 -0700
tree 43ce6b653e9852ef91913631790cb29b3c4cd725
parent 32e8e0421c34cfbeffdbb35e57751e9c4d8d1fa2

Fix host oat_test on portable.

Change-Id: I8d72b89dc8a7dc9243ce77551a8a01a10c5ec9ce

runtime/oat_test.cc

diff --git a/runtime/oat_test.cc b/runtime/oat_test.cc
index 9fb2638..5d0dca9 100644
--- a/runtime/oat_test.cc
+++ b/runtime/oat_test.cc
@@ -74,7 +74,8 @@
 #else
   CompilerBackend compiler_backend = kQuick;
 #endif
-  compiler_driver_.reset(new CompilerDriver(compiler_backend, kThumb2, false, NULL, 2, true));
+  InstructionSet insn_set = kIsTargetBuild ? kThumb2 : kX86;
+  compiler_driver_.reset(new CompilerDriver(compiler_backend, insn_set, false, NULL, 2, true));
   jobject class_loader = NULL;
   if (compile) {
     base::TimingLogger timings("OatTest::WriteRead", false, false);