Merge "[pgo] Do not explicitly link profile runtime" (4c0b11a1) · Commits · e / os / android_build_soong

cc/cc.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -1833,12 +1833,6 @@ func (c *Module) deps(ctx DepsContext) Deps {
		if c.compiler != nil {
		deps = c.compiler.compilerDeps(ctx, deps)
		}
		// Add the PGO dependency (the clang_rt.profile runtime library), which
		// sometimes depends on symbols from libgcc, before libgcc gets added
		// in linkerDeps().
		if c.pgo != nil {
		deps = c.pgo.deps(ctx, deps)
		}
		if c.linker != nil {
		deps = c.linker.linkerDeps(ctx, deps)
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -245,10 +245,6 @@ func ThreadSanitizerRuntimeLibrary(t Toolchain) string {
		return LibclangRuntimeLibrary(t, "tsan")
		}

		func ProfileRuntimeLibrary(t Toolchain) string {
		return LibclangRuntimeLibrary(t, "profile")
		}

		func ScudoRuntimeLibrary(t Toolchain) string {
		return LibclangRuntimeLibrary(t, "scudo")
		}

+0 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import (
		"github.com/google/blueprint/proptools"

		"android/soong/android"
		"android/soong/cc/config"
		)

		var (
		@@ -271,14 +270,6 @@ func (pgo *pgo) begin(ctx BaseModuleContext) {
		}
		}

		func (pgo *pgo) deps(ctx BaseModuleContext, deps Deps) Deps {
		if pgo.Properties.ShouldProfileModule {
		runtimeLibrary := config.ProfileRuntimeLibrary(ctx.toolchain())
		deps.LateStaticLibs = append(deps.LateStaticLibs, runtimeLibrary)
		}
		return deps
		}

		func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags {
		if ctx.Host() {
		return flags