From deebb99a53b0af3ccfde9daaef8cae8fad9e44d2 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Mon, 2 Mar 2015 11:49:22 -0800
Subject: [PATCH] Fix AddCurrentRuntimeFeaturesAsDex2OatArguments jit handling

Now jit passes interpret filter to dex2oat.

Bug: 19550422
Change-Id: I932c7d1084acbb9d356ad0f5534a270e2ca2d6ec
---
 runtime/runtime.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 8c5827cbf..edc55c862 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1657,7 +1657,7 @@ void Runtime::SetFaultMessage(const std::string& message) {
 
 void Runtime::AddCurrentRuntimeFeaturesAsDex2OatArguments(std::vector<std::string>* argv)
     const {
-  if (GetInstrumentation()->InterpretOnly()) {
+  if (GetInstrumentation()->InterpretOnly() || UseJit()) {
     argv->push_back("--compiler-filter=interpret-only");
   }
 
-- 
2.11.0