From dd0554722ac788bb5cdfbfe2fc5b8568eeb5372e Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Mon, 28 Sep 2020 13:22:45 -0400 Subject: 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 --- rust/library.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'rust/library.go') 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 { -- cgit v1.2.3-59-g8ed1b