Merge "Change stdlib linkage for C libraries." (bdebb171) · Commits · e / os / android_build_soong

rust/library.go

+10 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import (
		"strings"

		"android/soong/android"
		"android/soong/rust/config"
		)

		func init() {
		@@ -304,6 +305,15 @@ func (library *libraryDecorator) compilerProps() []interface{} {
		}

		func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {

		// TODO(b/144861059) Remove if C libraries support dylib linkage in the future.
		if !ctx.Host() && (library.static() \|\| library.shared()) {
		library.setNoStdlibs()
		for _, stdlib := range config.Stdlibs {
		deps.Rlibs = append(deps.Rlibs, stdlib+".static")
		}
		}

		deps = library.baseCompiler.compilerDeps(ctx, deps)

		if ctx.toolchain().Bionic() && (library.dylib() \|\| library.shared()) {