diff options
| -rw-r--r-- | rust/config/global.go | 4 | ||||
| -rw-r--r-- | rust/fuzz_test.go | 8 | ||||
| -rw-r--r-- | rust/sanitize.go | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/rust/config/global.go b/rust/config/global.go index c1ce13f12..1cf773e44 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -24,7 +24,7 @@ import ( var pctx = android.NewPackageContext("android/soong/rust/config") var ( - RustDefaultVersion = "1.58.1" + RustDefaultVersion = "1.59.0" RustDefaultBase = "prebuilts/rust/" DefaultEdition = "2021" Stdlibs = []string{ @@ -49,7 +49,7 @@ var ( "-C overflow-checks=on", "-C force-unwind-tables=yes", // Use v0 mangling to distinguish from C++ symbols - "-Z symbol-mangling-version=v0", + "-C symbol-mangling-version=v0", } deviceGlobalRustFlags = []string{ diff --git a/rust/fuzz_test.go b/rust/fuzz_test.go index 98be7c20d..865665eef 100644 --- a/rust/fuzz_test.go +++ b/rust/fuzz_test.go @@ -47,17 +47,17 @@ func TestRustFuzz(t *testing.T) { // Check that compiler flags are set appropriately . fuzz_libtest := ctx.ModuleForTests("fuzz_libtest", "android_arm64_armv8-a_fuzzer").Rule("rustc") if !strings.Contains(fuzz_libtest.Args["rustcFlags"], "-Z sanitizer=hwaddress") || - !strings.Contains(fuzz_libtest.Args["rustcFlags"], "-C passes='sancov'") || + !strings.Contains(fuzz_libtest.Args["rustcFlags"], "-C passes='sancov-module'") || !strings.Contains(fuzz_libtest.Args["rustcFlags"], "--cfg fuzzing") { - t.Errorf("rust_fuzz module does not contain the expected flags (sancov, cfg fuzzing, hwaddress sanitizer).") + t.Errorf("rust_fuzz module does not contain the expected flags (sancov-module, cfg fuzzing, hwaddress sanitizer).") } // Check that dependencies have 'fuzzer' variants produced for them as well. libtest_fuzzer := ctx.ModuleForTests("libtest_fuzzing", "android_arm64_armv8-a_rlib_rlib-std_fuzzer").Output("libtest_fuzzing.rlib") if !strings.Contains(libtest_fuzzer.Args["rustcFlags"], "-Z sanitizer=hwaddress") || - !strings.Contains(libtest_fuzzer.Args["rustcFlags"], "-C passes='sancov'") || + !strings.Contains(libtest_fuzzer.Args["rustcFlags"], "-C passes='sancov-module'") || !strings.Contains(libtest_fuzzer.Args["rustcFlags"], "--cfg fuzzing") { - t.Errorf("rust_fuzz dependent library does not contain the expected flags (sancov, cfg fuzzing, hwaddress sanitizer).") + t.Errorf("rust_fuzz dependent library does not contain the expected flags (sancov-module, cfg fuzzing, hwaddress sanitizer).") } } diff --git a/rust/sanitize.go b/rust/sanitize.go index be9dc42a8..39aaf33c2 100644 --- a/rust/sanitize.go +++ b/rust/sanitize.go @@ -57,7 +57,7 @@ type SanitizeProperties struct { } var fuzzerFlags = []string{ - "-C passes='sancov'", + "-C passes='sancov-module'", "--cfg fuzzing", "-C llvm-args=-sanitizer-coverage-level=3", @@ -70,7 +70,7 @@ var fuzzerFlags = []string{ "-C link-dead-code", // Sancov breaks with lto - // TODO: Remove when https://bugs.llvm.org/show_bug.cgi?id=41734 is resolved and sancov works with LTO + // TODO: Remove when https://bugs.llvm.org/show_bug.cgi?id=41734 is resolved and sancov-module works with LTO "-C lto=no", } |