commit 7c5e5c61e7c319ec88dc037f30b2ab357ec4db9a
author Vladimir Marko <vmarko@google.com> Tue Mar 16 16:46:00 2021 +0000
committer Vladimir Marko <vmarko@google.com> Wed Mar 17 09:06:28 2021 +0000
tree d4a662d3e2c9bbe4391ebcb31c592ad0d3b81800
parent 0e9d9fce596125df602c1210c948259e9e7ca4ec

Fix DexToDexCompiler setup condition.

We were wasting unnecessary time for DexToDexCompiler setup
despite dex-to-dex compile being deprecated and disabled.

Test: m
Bug: 170086509
Bug: 181943478
Change-Id: I420b26fbc0b870c8c9a879c5f24b1583afecce76

dex2oat/driver/compiler_driver.cc

diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index e23d1b0..280ac45 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -846,7 +846,7 @@
 void CompilerDriver::PrepareDexFilesForOatFile(TimingLogger* timings) {
   compiled_classes_.AddDexFiles(GetCompilerOptions().GetDexFilesForOatFile());
 
-  if (GetCompilerOptions().IsAnyCompilationEnabled()) {
+  if (GetCompilerOptions().IsQuickeningCompilationEnabled()) {
     TimingLogger::ScopedTiming t2("Dex2Dex SetDexFiles", timings);
     dex_to_dex_compiler_.SetDexFiles(GetCompilerOptions().GetDexFilesForOatFile());
   }