diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-10 17:30:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-10 17:30:40 +0000 |
| commit | d2bb32e3ba5f8101f0e9c42b363250b1aa186c08 (patch) | |
| tree | 6145a579ed8be928cdc5234473bf62ebb4e79b4c /runtime | |
| parent | aff49cd4f8044d91ccfa6ebb6e2f52ced031fcd0 (diff) | |
| parent | cb85ad6673a0b0815fe40100a14984fd187a5f89 (diff) | |
| download | art-d2bb32e3ba5f8101f0e9c42b363250b1aa186c08.zip art-d2bb32e3ba5f8101f0e9c42b363250b1aa186c08.tar.gz art-d2bb32e3ba5f8101f0e9c42b363250b1aa186c08.tar.bz2 | |
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.
Diffstat (limited to 'runtime')
| -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 d683cdc..71679ae 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"); |