diff options
| author | 2020-09-28 13:22:45 -0400 | |
|---|---|---|
| committer | 2020-09-28 13:26:05 -0400 | |
| commit | dd0554722ac788bb5cdfbfe2fc5b8568eeb5372e (patch) | |
| tree | 0b4750fde9c7bb7d7c30012fc026ce1cd770efe2 /rust/library.go | |
| parent | 11200870b0cd84e9bbccb89b66cf59b5ed4db526 (diff) | |
rust: Refactor staticStd to stdLinkage
Instead of returning a boolean, return an enum value to improve
readability and provide greater flexibility for future modifications.
Bug: 168729404
Test: Soong tests pass
Change-Id: Iddcdae8c34be09e476404382e43d1ea5935bae65
Diffstat (limited to 'rust/library.go')
| -rw-r--r-- | rust/library.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rust/library.go b/rust/library.go index 2792c5b4a..7a77706a9 100644 --- a/rust/library.go +++ b/rust/library.go @@ -158,9 +158,12 @@ func (library *libraryDecorator) static() bool { return library.MutatedProperties.VariantIsStatic } -func (library *libraryDecorator) staticStd(ctx *depsContext) bool { - // libraries should only request the staticStd when building a static FFI or when variant is staticStd - return library.static() || library.MutatedProperties.VariantIsStaticStd +func (library *libraryDecorator) stdLinkage(ctx *depsContext) RustLinkage { + // libraries should only request the RlibLinkage when building a static FFI or when variant is StaticStd + if library.static() || library.MutatedProperties.VariantIsStaticStd { + return RlibLinkage + } + return DefaultLinkage } func (library *libraryDecorator) source() bool { |