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

Merge "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" am: 38414db4de am: aeca1f6aa0

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

Change-Id: I7b3b4dee24f62f30578ff970fcdd193e87aa1c21
This commit is contained in:
Bowgo Tsai
2020-08-28 09:03:40 +00:00
committed by Automerger Merge Worker
parent 6ad781dadb aeca1f6aa0
commit dffdcb2d6a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/pgo.go
View File

@@ -290,16 +290,17 @@ func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags {
// Add flags to profile this module based on its profile_kind
if props.ShouldProfileModule && props.isInstrumentation() {
props.addInstrumentationProfileGatherFlags(ctx, flags)
// Instrumentation PGO use and gather flags cannot coexist.
return props.addInstrumentationProfileGatherFlags(ctx, flags)
return flags
} else if props.ShouldProfileModule && props.isSampling() {
flags = props.addSamplingProfileGatherFlags(ctx, flags)
props.addSamplingProfileGatherFlags(ctx, flags)
} else if ctx.DeviceConfig().SamplingPGO() {
flags = props.addSamplingProfileGatherFlags(ctx, flags)
props.addSamplingProfileGatherFlags(ctx, flags)
}
if !ctx.Config().IsEnvTrue("ANDROID_PGO_NO_PROFILE_USE") {
flags = props.addProfileUseFlags(ctx, flags)
props.addProfileUseFlags(ctx, flags)
}
return flags