diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-10 17:24:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-10 17:24:26 +0000 |
| commit | cb85ad6673a0b0815fe40100a14984fd187a5f89 (patch) | |
| tree | ae59747148a3958207b92bbde3aeb19ab239d94d /runtime/oat_file_assistant_test.cc | |
| parent | 9a5342ef8535b54305dab72e2ac1b3412a053f9d (diff) | |
| parent | 05dd8a63e213d2bf025c97b9cd04eee354d0e5b4 (diff) | |
| download | art-cb85ad6673a0b0815fe40100a14984fd187a5f89.tar.gz art-cb85ad6673a0b0815fe40100a14984fd187a5f89.tar.bz2 art-cb85ad6673a0b0815fe40100a14984fd187a5f89.zip | |
Merge "Use quick compiler to generate odex for oat file assistant tests."
Diffstat (limited to 'runtime/oat_file_assistant_test.cc')
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 4 |
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"); |