summaryrefslogtreecommitdiff
path: root/rust/rust.go
diff options
context:
space:
mode:
author Sam Delmerico <delmerico@google.com> 2023-03-28 16:54:00 -0400
committer Sam Delmerico <delmerico@google.com> 2023-03-29 14:33:20 +0000
commit51d6d1c585bc5ce8fc281acb0133cbee5c8f379e (patch)
tree054777e63e3348d14dc6798a700face5e833f680 /rust/rust.go
parent13ca1a92071c211a239670d0249461ebea84a0e8 (diff)
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
Diffstat (limited to 'rust/rust.go')
-rw-r--r--rust/rust.go2
1 files changed, 1 insertions, 1 deletions
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...)