diff options
author | 2024-12-11 21:38:53 +0000 | |
---|---|---|
committer | 2024-12-13 19:53:20 +0000 | |
commit | 806efd3885d6eecfa1b1bd1697431c0ab073a76a (patch) | |
tree | a63dc4cae01bd6371745cdcce8fc979250fff654 /cc/cc.go | |
parent | f7bbd2fe40e43f7fda7e08d08eeb9c2a93552ad9 (diff) |
rust: Alias rust_ffi_rlib to rust_library_rlib
With the new transition mutators, the distinctions between rust_ffi_rlib
and rust_library_rlib are not necessary. This CL removes the remaining
distinctions to allow an unusual use case where a rust_library and a
rust_ffi_rlib would otherwise be created from the same source. This
would allow defining a single rust_library_rlib that works for both rust
modules and cc modules.
One key change is that rust_ffi_rlibs only produced an rlib-std variant
previously, and now produce dylib-std variants as well.This surfaced an
issue where a libstd linkage mismatch would cause rustc to throw a
consufing missing crate error. We instead add logic to catch this in
Soong and provide a more useful error message.
Bug: 383552450
Test: m rust
Test: m blueprint_tests
Change-Id: I611ca46934059735d06229952cfd8e0ab7050486
Diffstat (limited to 'cc/cc.go')
-rw-r--r-- | cc/cc.go | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -1197,11 +1197,6 @@ func (c *Module) BuildRlibVariant() bool { return false } -func (c *Module) IsRustFFI() bool { - // cc modules are not Rust modules - return false -} - func (c *Module) Module() android.Module { return c } |