From f1f6dd17d1eacf355fa3ec7318606945332577bd Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 7 Jun 2022 11:15:59 -0700 Subject: [PATCH] [rust/coverage] Use new flag for coverage instrumentation > warning: `-Z instrument-coverage` is deprecated; use `-C instrument-coverage` Test: above warning is absent when running: $ m CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS=* rust Change-Id: I8687c04534db3c8a67f209b93ed13d54c2f86dc8 --- rust/coverage.go | 2 +- rust/coverage_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/coverage.go b/rust/coverage.go index 651ce6e16..5ea481fcf 100644 --- a/rust/coverage.go +++ b/rust/coverage.go @@ -56,7 +56,7 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags flags.Coverage = true coverage := ctx.GetDirectDepWithTag(CovLibraryName, cc.CoverageDepTag).(cc.LinkableInterface) flags.RustFlags = append(flags.RustFlags, - "-Z instrument-coverage", "-g") + "-C instrument-coverage", "-g") flags.LinkFlags = append(flags.LinkFlags, profileInstrFlag, "-g", coverage.OutputFile().Path().String(), "-Wl,--wrap,open") deps.StaticLibs = append(deps.StaticLibs, coverage.OutputFile().Path()) diff --git a/rust/coverage_test.go b/rust/coverage_test.go index f3cd3758c..0f599d745 100644 --- a/rust/coverage_test.go +++ b/rust/coverage_test.go @@ -56,7 +56,7 @@ func TestCoverageFlags(t *testing.T) { fizzCov := ctx.ModuleForTests("fizz_cov", "android_arm64_armv8-a_cov").Rule("rustc") buzzNoCov := ctx.ModuleForTests("buzzNoCov", "android_arm64_armv8-a").Rule("rustc") - rustcCoverageFlags := []string{"-Z instrument-coverage", " -g "} + rustcCoverageFlags := []string{"-C instrument-coverage", " -g "} for _, flag := range rustcCoverageFlags { missingErrorStr := "missing rustc flag '%s' for '%s' module with coverage enabled; rustcFlags: %#v" containsErrorStr := "contains rustc flag '%s' for '%s' module with coverage disabled; rustcFlags: %#v"