diff --git a/cc/pgo.go b/cc/pgo.go index 674e1bbf1..6bf0ad0aa 100644 --- a/cc/pgo.go +++ b/cc/pgo.go @@ -290,17 +290,16 @@ 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 flags + return props.addInstrumentationProfileGatherFlags(ctx, flags) } else if props.ShouldProfileModule && props.isSampling() { - props.addSamplingProfileGatherFlags(ctx, flags) + flags = props.addSamplingProfileGatherFlags(ctx, flags) } else if ctx.DeviceConfig().SamplingPGO() { - props.addSamplingProfileGatherFlags(ctx, flags) + flags = props.addSamplingProfileGatherFlags(ctx, flags) } if !ctx.Config().IsEnvTrue("ANDROID_PGO_NO_PROFILE_USE") { - props.addProfileUseFlags(ctx, flags) + flags = props.addProfileUseFlags(ctx, flags) } return flags