Merge "Don't link bionicDeps for noStdlibs bindgen." am: 28f6442674

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453070

Change-Id: I8c6008173735ba5c16afe1cfc439a9173c7269b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-24 03:00:53 +00:00
committed by Automerger Merge Worker

View File

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