Merge "Omit "--compiler-filter" if the profile is disabled."
This commit is contained in:
@@ -760,8 +760,13 @@ func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, p
|
|||||||
FlagWithArg("--android-root=", global.EmptyDirectory).
|
FlagWithArg("--android-root=", global.EmptyDirectory).
|
||||||
FlagWithArg("--no-inline-from=", "core-oj.jar").
|
FlagWithArg("--no-inline-from=", "core-oj.jar").
|
||||||
Flag("--force-determinism").
|
Flag("--force-determinism").
|
||||||
Flag("--abort-on-hard-verifier-error").
|
Flag("--abort-on-hard-verifier-error")
|
||||||
FlagWithArg("--compiler-filter=", image.compilerFilter)
|
|
||||||
|
// If the image is profile-guided but the profile is disabled, we omit "--compiler-filter" to
|
||||||
|
// leave the decision to dex2oat to pick the compiler filter.
|
||||||
|
if !(image.isProfileGuided() && global.DisableGenerateProfile) {
|
||||||
|
cmd.FlagWithArg("--compiler-filter=", image.compilerFilter)
|
||||||
|
}
|
||||||
|
|
||||||
// Use the default variant/features for host builds.
|
// Use the default variant/features for host builds.
|
||||||
// The map below contains only device CPU info (which might be x86 on some devices).
|
// The map below contains only device CPU info (which might be x86 on some devices).
|
||||||
|
Reference in New Issue
Block a user