From 5ded619f3ea6d8f489b3e862e34ca2b1d413bd3d Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 6 Dec 2021 15:43:06 +0800 Subject: [PATCH] addSamplingProfileGatherFlags is no longer needed We already add the "-fdebug-info-for-profiling" flag globally by default. Besides, Sampling PGO does not need additional target-specific build flags, unlike instrumentation PGO. This is preparation to separate out sampling pgo into a separate module. NFCI. Test: presubmit Change-Id: Icb28a98c021a78db25d8cb5ca9694ed6b7367a8d --- android/config.go | 4 ---- android/variable.go | 2 -- cc/pgo.go | 8 -------- 3 files changed, 14 deletions(-) diff --git a/android/config.go b/android/config.go index ddad1f532..8e01e186b 100644 --- a/android/config.go +++ b/android/config.go @@ -1194,10 +1194,6 @@ func (c *deviceConfig) DeviceKernelHeaderDirs() []string { return c.config.productVariables.DeviceKernelHeaders } -func (c *deviceConfig) SamplingPGO() bool { - return Bool(c.config.productVariables.SamplingPGO) -} - // JavaCoverageEnabledForPath returns whether Java code coverage is enabled for // path. Coverage is enabled by default when the product variable // JavaCoveragePaths is empty. If JavaCoveragePaths is not empty, coverage is diff --git a/android/variable.go b/android/variable.go index a29c6f86a..158d26453 100644 --- a/android/variable.go +++ b/android/variable.go @@ -299,8 +299,6 @@ type productVariables struct { ClangTidy *bool `json:",omitempty"` TidyChecks *string `json:",omitempty"` - SamplingPGO *bool `json:",omitempty"` - JavaCoveragePaths []string `json:",omitempty"` JavaCoverageExcludePaths []string `json:",omitempty"` diff --git a/cc/pgo.go b/cc/pgo.go index e78549e7b..cd017c446 100644 --- a/cc/pgo.go +++ b/cc/pgo.go @@ -96,10 +96,6 @@ func (props *PgoProperties) addInstrumentationProfileGatherFlags(ctx ModuleConte flags.Local.LdFlags = append(flags.Local.LdFlags, profileInstrumentFlag) return flags } -func (props *PgoProperties) addSamplingProfileGatherFlags(ctx ModuleContext, flags Flags) Flags { - flags.Local.CFlags = append(flags.Local.CFlags, props.Pgo.Cflags...) - return flags -} func (props *PgoProperties) getPgoProfileFile(ctx BaseModuleContext) android.OptionalPath { profileFile := *props.Pgo.Profile_file @@ -313,10 +309,6 @@ func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags { if (props.ShouldProfileModule && props.isInstrumentation()) || props.PgoInstrLink { // Instrumentation PGO use and gather flags cannot coexist. return props.addInstrumentationProfileGatherFlags(ctx, flags) - } else if props.ShouldProfileModule && props.isSampling() { - flags = props.addSamplingProfileGatherFlags(ctx, flags) - } else if ctx.DeviceConfig().SamplingPGO() { - flags = props.addSamplingProfileGatherFlags(ctx, flags) } if !ctx.Config().IsEnvTrue("ANDROID_PGO_NO_PROFILE_USE") {