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

Merge "Omit "--compiler-filter" if the profile is disabled." am: 15e6b1240e am: 1decfa2cbc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460212

Change-Id: I2498c04a2a229c794e6d1ccf0dd7b1600934409b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-28 21:14:13 +00:00
committed by Automerger Merge Worker
parent f5251b022e 1decfa2cbc
commit 6260dec22f
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).