StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Omit "--compiler-filter" if the profile is disabled.

Browse Source 
This fixes the Golem regression caused by aosp/2453067. On Golem, the
profile disabled and dex2oat uses the default "speed" compiler filter.

Bug: 269230245
Test: art/tools/golem/build-target.sh --machine-type=android-armv8 --golem=art-interpreter
Change-Id: I4fc0dbf9eac8839f7bacd264ddab177956ddd58e
This commit is contained in:
Jiakai Zhang
2023-02-28 15:13:44 +00:00
parent 6cf6f8032e
commit 63086d7af0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/dexpreopt_bootjars.go
View File

@@ -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).