Merge "Don't link bionicDeps for noStdlibs bindgen."

This commit is contained in:
Treehugger Robot
2023-02-23 22:41:11 +00:00
committed by Gerrit Code Review

View File

@@ -313,7 +313,7 @@ func NewRustBindgen(hod android.HostOrDeviceSupported) (*Module, *bindgenDecorat
func (b *bindgenDecorator) SourceProviderDeps(ctx DepsContext, deps Deps) Deps { func (b *bindgenDecorator) SourceProviderDeps(ctx DepsContext, deps Deps) Deps {
deps = b.BaseSourceProvider.SourceProviderDeps(ctx, deps) deps = b.BaseSourceProvider.SourceProviderDeps(ctx, deps)
if ctx.toolchain().Bionic() { if ctx.toolchain().Bionic() && !ctx.RustModule().compiler.noStdlibs() {
deps = bionicDeps(ctx, deps, false) deps = bionicDeps(ctx, deps, false)
} else if ctx.Os() == android.LinuxMusl { } else if ctx.Os() == android.LinuxMusl {
deps = muslDeps(ctx, deps, false) deps = muslDeps(ctx, deps, false)