diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 36a5e2aa2..888466a2f 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -85,7 +85,7 @@ type GlobalConfig struct { Dex2oatImageXmx string // max heap size for dex2oat for the boot image Dex2oatImageXms string // initial heap size for dex2oat for the boot image - // If true, downgrade the compiler filter of dexpreopt to "extract" when verify_uses_libraries + // If true, downgrade the compiler filter of dexpreopt to "verify" when verify_uses_libraries // check fails, instead of failing the build. This will disable any AOT-compilation. // // The intended use case for this flag is to have a smoother migration path for the Java diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 6e0fe01f9..737773fcb 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -369,11 +369,11 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g } if module.EnforceUsesLibraries { // If the verify_uses_libraries check failed (in this case status file contains a - // non-empty error message), then use "extract" compiler filter to avoid compiling any + // non-empty error message), then use "verify" compiler filter to avoid compiling any // code (it would be rejected on device because of a class loader context mismatch). cmd.Text("--compiler-filter=$(if test -s "). Input(module.EnforceUsesLibrariesStatusFile). - Text(" ; then echo extract ; else echo " + compilerFilter + " ; fi)") + Text(" ; then echo verify ; else echo " + compilerFilter + " ; fi)") } else { cmd.FlagWithArg("--compiler-filter=", compilerFilter) }