From 51d6d1c585bc5ce8fc281acb0133cbee5c8f379e Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Tue, 28 Mar 2023 16:54:00 -0400 Subject: pass cc shared libs as order-only to rustc The library file for a cc_shared_library dependency is added to the linkFlags of the rustc compilation action, but no explicit dependency was made on it from a Ninja perspective if a TOC was also present. This change adds the explicit dependency on the library file whether or not a TOC is present. Test: m crosvm Bug: 275416061 Change-Id: I625b62762d9ba7b4fd2b8362285528e47f728dd4 --- rust/rust.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index 018cdab98..f85babca4 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1413,7 +1413,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { depPaths.RLibs = append(depPaths.RLibs, rlibDepFiles...) depPaths.DyLibs = append(depPaths.DyLibs, dylibDepFiles...) - depPaths.SharedLibs = append(depPaths.SharedLibs, sharedLibDepFiles...) + depPaths.SharedLibs = append(depPaths.SharedLibs, sharedLibFiles...) depPaths.SharedLibDeps = append(depPaths.SharedLibDeps, sharedLibDepFiles...) depPaths.StaticLibs = append(depPaths.StaticLibs, staticLibDepFiles...) depPaths.ProcMacros = append(depPaths.ProcMacros, procMacroDepFiles...) -- cgit v1.2.3-59-g8ed1b