diff options
| author | 2023-09-23 05:19:13 +0000 | |
|---|---|---|
| committer | 2023-09-23 05:19:13 +0000 | |
| commit | 40c7bae1df1028cc4f5545938858c16d5040442f (patch) | |
| tree | e58fd7c96d37c504959ccfe41431323f2e2c0c21 /rust/coverage.go | |
| parent | 4ad574cc37f23d36428d8947dd3f29bcacdb0ef4 (diff) | |
| parent | 930fd8bfb1190e20789c332d3f8d7de79bcee13c (diff) | |
Merge changes from topics "revert-2629131-sandbox-rust-inputs-JRFPQTIPEY", "revert-2758566-WBNIADIEXA" into main
* changes:
Revert^3 "add rust_toolchain_rustc_prebuilt module type"
Revert^3 "add crate_root property to rust modules"
Revert^3 "allow Ninja variables in RuleBuilder API"
Revert "conditionally escape rule builder command"
Revert "support sandboxed rust rules"
Revert "fix failing rust_aconfig_library test"
Revert "rustSetToolchainSource to use linux-x86 srcs"
Revert "remove rust deps on clang prebuilts"
Diffstat (limited to 'rust/coverage.go')
| -rw-r--r-- | rust/coverage.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/rust/coverage.go b/rust/coverage.go index b312194f2..5216d6098 100644 --- a/rust/coverage.go +++ b/rust/coverage.go @@ -17,7 +17,6 @@ package rust import ( "github.com/google/blueprint" - "android/soong/android" "android/soong/cc" ) @@ -71,10 +70,7 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags // no_std modules are missing libprofiler_builtins which provides coverage, so we need to add it as a dependency. if rustModule, ok := ctx.Module().(*Module); ok && rustModule.compiler.noStdlibs() { profiler_builtins := ctx.GetDirectDepWithTag(ProfilerBuiltins, rlibDepTag).(*Module) - deps.Rlibs = android.AddDirectToDepSet[RustLibrary](deps.Rlibs, RustLibrary{ - Path: profiler_builtins.OutputFile().Path(), - CrateName: profiler_builtins.CrateName(), - }) + deps.RLibs = append(deps.RLibs, RustLibrary{Path: profiler_builtins.OutputFile().Path(), CrateName: profiler_builtins.CrateName()}) } if cc.EnableContinuousCoverage(ctx) { |