diff options
| author | 2024-10-07 23:20:04 +0000 | |
|---|---|---|
| committer | 2024-10-07 23:20:04 +0000 | |
| commit | 1005d6f910d9b4ad0421d19e957bc23beaac83b2 (patch) | |
| tree | 9dc8adc41fd1d1e885839efe4b65922e219035c4 /rust/compiler.go | |
| parent | a2626efdbffc4c7ba115dfb6ecef8e7982b0877d (diff) | |
| parent | 127f95c1d831d1e9f12265a5c10c8620280f45ab (diff) | |
Merge "Make rust rustlibs property configurable" into main
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 5bce16b8d..fd869174c 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -154,7 +154,7 @@ type BaseCompilerProperties struct { // list of rust automatic crate dependencies. // Rustlibs linkage is rlib for host targets and dylib for device targets. - Rustlibs []string `android:"arch_variant"` + Rustlibs proptools.Configurable[[]string] `android:"arch_variant"` // list of rust proc_macro crate dependencies Proc_macros []string `android:"arch_variant"` @@ -497,7 +497,7 @@ func (compiler *baseCompiler) strippedOutputFilePath() android.OptionalPath { func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { deps.Rlibs = append(deps.Rlibs, compiler.Properties.Rlibs...) - deps.Rustlibs = append(deps.Rustlibs, compiler.Properties.Rustlibs...) + deps.Rustlibs = append(deps.Rustlibs, compiler.Properties.Rustlibs.GetOrDefault(ctx, nil)...) deps.ProcMacros = append(deps.ProcMacros, compiler.Properties.Proc_macros...) deps.StaticLibs = append(deps.StaticLibs, compiler.Properties.Static_libs...) deps.WholeStaticLibs = append(deps.WholeStaticLibs, compiler.Properties.Whole_static_libs...) |