From 41326c1f410bafb909a56f1cf7ca8748ce06cab3 Mon Sep 17 00:00:00 2001 From: Wen-yi Chu Date: Fri, 22 Sep 2023 03:58:59 +0000 Subject: Revert "support sandboxed rust rules" Revert submission 2629131-sandbox-rust-inputs Reason for revert: Fail on android build. Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs Change-Id: Ifd9aa46e80a12d8f4ffa0a2daa74b96727cbb7e6 --- rust/coverage.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'rust/coverage.go') 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) { -- cgit v1.2.3-59-g8ed1b