am cb85ad66: Merge "Use quick compiler to generate odex for oat file assistant tests."

* commit 'cb85ad6673a0b0815fe40100a14984fd187a5f89':
  Use quick compiler to generate odex for oat file assistant tests.

1 files changed, 4 insertions, 0 deletions

diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc
index d683cdc31c..71679ae480 100644
--- a/runtime/oat_file_assistant_test.cc
+++ b/runtime/oat_file_assistant_test.cc
@@ -175,6 +175,10 @@ class OatFileAssistantTest : public CommonRuntimeTest {
       args.push_back("--compile-pic");
     } else {
       args.push_back("--include-patch-information");
+
+      // We need to use the quick compiler to generate non-PIC code, because
+      // the optimizing compiler always generates PIC.
+      args.push_back("--compiler-backend=Quick");
     }
     args.push_back("--runtime-arg");
     args.push_back("-Xnorelocate");