diff --git a/cc/cc.go b/cc/cc.go index cab7459ed..0c46b24cb 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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) } diff --git a/cc/config/toolchain.go b/cc/config/toolchain.go index 59c042230..fce28c1ee 100644 --- a/cc/config/toolchain.go +++ b/cc/config/toolchain.go @@ -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") } diff --git a/cc/pgo.go b/cc/pgo.go index ada694b06..95c9c2e50 100644 --- a/cc/pgo.go +++ b/cc/pgo.go @@ -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