Merge "Dexpreopt: use "speed-profile" if a system server jar has a profile."

This commit is contained in:
Jiakai Zhang
2022-07-07 16:57:44 +00:00
committed by Gerrit Code Review

View File

@@ -394,10 +394,14 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g
if !android.PrefixInList(preoptFlags, "--compiler-filter=") { if !android.PrefixInList(preoptFlags, "--compiler-filter=") {
var compilerFilter string var compilerFilter string
if systemServerJars.ContainsJar(module.Name) { if systemServerJars.ContainsJar(module.Name) {
// Jars of system server, use the product option if it is set, speed otherwise.
if global.SystemServerCompilerFilter != "" { if global.SystemServerCompilerFilter != "" {
// Use the product option if it is set.
compilerFilter = global.SystemServerCompilerFilter compilerFilter = global.SystemServerCompilerFilter
} else if profile != nil {
// Use "speed-profile" for system server jars that have a profile.
compilerFilter = "speed-profile"
} else { } else {
// Use "speed" for system server jars that do not have a profile.
compilerFilter = "speed" compilerFilter = "speed"
} }
} else if contains(global.SpeedApps, module.Name) || contains(global.SystemServerApps, module.Name) { } else if contains(global.SpeedApps, module.Name) || contains(global.SystemServerApps, module.Name) {