diff options
| author | 2023-08-15 13:45:10 +0000 | |
|---|---|---|
| committer | 2023-08-15 13:45:10 +0000 | |
| commit | e6adc83c6ca34eacadbc7518076561914f8f3308 (patch) | |
| tree | 44989e559f9e6344940d678db0687df1a260c663 /rust/compiler.go | |
| parent | 78e4695b3a1831ac81c02698da4b7b2cd03cb17b (diff) | |
| parent | 4eeb2a9514a8341623347fcf2bb3e9c459a90219 (diff) | |
Merge "Remove dylibs prop from rust module types" into main
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 06ae12f79..84c1fce9b 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -91,10 +91,8 @@ type BaseCompilerProperties struct { // list of rust rlib crate dependencies Rlibs []string `android:"arch_variant"` - // list of rust dylib crate dependencies - Dylibs []string `android:"arch_variant"` - - // list of rust automatic crate dependencies + // list of rust automatic crate dependencies. + // Rustlibs linkage is rlib for host targets and dylib for device targets. Rustlibs []string `android:"arch_variant"` // list of rust proc_macro crate dependencies @@ -359,7 +357,6 @@ func (compiler *baseCompiler) strippedOutputFilePath() android.OptionalPath { func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { deps.Rlibs = append(deps.Rlibs, compiler.Properties.Rlibs...) - deps.Dylibs = append(deps.Dylibs, compiler.Properties.Dylibs...) deps.Rustlibs = append(deps.Rustlibs, compiler.Properties.Rustlibs...) deps.ProcMacros = append(deps.ProcMacros, compiler.Properties.Proc_macros...) deps.StaticLibs = append(deps.StaticLibs, compiler.Properties.Static_libs...) |