diff options
| author | 2025-02-07 11:54:07 -0800 | |
|---|---|---|
| committer | 2025-02-07 11:54:07 -0800 | |
| commit | 5d515842eb00202ebdb642bd0cc933be6f76869f (patch) | |
| tree | fcaf88d1fe49e3941b3d1776d93bcdd41158f996 /rust/rust.go | |
| parent | 25ec2c1d642538e14b163281526311717d0eacb9 (diff) | |
| parent | c9b88c9ffeca0669e0e413ec153f80be3881d54f (diff) | |
Merge "Remove configurable values from providers" into main
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rust/rust.go b/rust/rust.go index 81c33e688..90e5277b0 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1199,10 +1199,11 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { // Define the linker info if compiler != nil because Rust currently // does compilation and linking in one step. If this changes in the future, // move this as appropriate. + baseCompilerProps := mod.compiler.baseCompilerProps() ccInfo.LinkerInfo = &cc.LinkerInfo{ - WholeStaticLibs: mod.compiler.baseCompilerProps().Whole_static_libs, - StaticLibs: mod.compiler.baseCompilerProps().Static_libs, - SharedLibs: mod.compiler.baseCompilerProps().Shared_libs, + WholeStaticLibs: baseCompilerProps.Whole_static_libs.GetOrDefault(ctx, nil), + StaticLibs: baseCompilerProps.Static_libs.GetOrDefault(ctx, nil), + SharedLibs: baseCompilerProps.Shared_libs.GetOrDefault(ctx, nil), } android.SetProvider(ctx, cc.CcInfoProvider, ccInfo) |