summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Richard Uhler <ruhler@google.com> 2015-03-10 10:02:23 -0700
committer Richard Uhler <ruhler@google.com> 2015-03-10 10:02:23 -0700
commit05dd8a63e213d2bf025c97b9cd04eee354d0e5b4 (patch)
tree02616bb5d1c58e7856adcf8095e1124f9e35c18d
parent7e9c99bd850e22b8a5e2b5419bcf0b1abf0e29e5 (diff)
Use quick compiler to generate odex for oat file assistant tests.
This is needed to generate non-PIC odex files, because optimizing compiler always generates PIC. Change-Id: Ic77a0faef6b36f13c61607327640e3378a7ee75e
-rw-r--r--runtime/oat_file_assistant_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc
index 4232b88ac3..443e3a869f 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");