Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d167cb authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "addSamplingProfileGatherFlags is no longer needed"

parents 970f8388 5ded619f

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -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"`

cc/pgo.go

+0 −8
Original line number Diff line number Diff line
@@ -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") {