diff options
| author | 2023-06-15 14:21:09 -0400 | |
|---|---|---|
| committer | 2023-06-15 18:29:22 +0000 | |
| commit | 4df0257fe565181641df292e8cd6e76a2f273cad (patch) | |
| tree | e3f062956348dccf5a70b0172d8bfeed86f7ae84 /rust/library.go | |
| parent | cbaa0d6eb9705fcda7e28aedaea477e8a91408b1 (diff) | |
rust: Make dylib-std the canonical rlib form
This removes the dylib-std suffix from rlib variants which link against
libstd dynamically. This is by far the common case.
This fixes an issue where 'm <rust_library_rlib>' would fail since Make
would expect the suffix to be included (e.g. 'm libfoo.dylib-std').
Bug: 173312517
Bug: 268086496
Test: m <rust_library_rlib> # without a suffix
Change-Id: I1e5778c57468302a8d672d5eb540047d8bb79314
Diffstat (limited to 'rust/library.go')
| -rw-r--r-- | rust/library.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rust/library.go b/rust/library.go index a3a567281..ca5ad1443 100644 --- a/rust/library.go +++ b/rust/library.go @@ -25,8 +25,7 @@ import ( ) var ( - DylibStdlibSuffix = ".dylib-std" - RlibStdlibSuffix = ".rlib-std" + RlibStdlibSuffix = ".rlib-std" ) func init() { @@ -756,7 +755,6 @@ func LibstdMutator(mctx android.BottomUpMutatorContext) { dylib.Disable() } rlib.Properties.RustSubName += RlibStdlibSuffix - dylib.Properties.RustSubName += DylibStdlibSuffix } } } |