Merge "Enable class unloading in dex2oat for quicken multidex"
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index f50e88f..a6036da 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -1774,11 +1774,11 @@
bool ShouldCompileDexFilesIndividually() const {
// Compile individually if we are not building an image, not using any compilation, and are
// using multidex.
- // This means extract, and verify, will use the individual compilation mode (to reduce RAM used
- // by the compiler).
+ // This means extract, verify, and quicken, will use the individual compilation mode (to reduce
+ // RAM used by the compiler).
return !IsImage() &&
dex_files_.size() > 1 &&
- !CompilerFilter::IsAnyCompilationEnabled(compiler_options_->GetCompilerFilter());
+ !CompilerFilter::IsAotCompilationEnabled(compiler_options_->GetCompilerFilter());
}
// Set up and create the compiler driver and then invoke it to compile all the dex files.