[pgo] Return updated Flags after adding flags for PGO/AFDO

Bug: http://b/162702246

Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
      PGO instrumentation.
Change-Id: I8044702e0aed4fa7bb9ac71608a83a95f319abd9
This commit is contained in:
Pirama Arumuga Nainar 2020-08-27 16:20:28 -07:00
parent b0e99edab1
commit 5010a97388
1 changed files with 4 additions and 5 deletions

View File

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