diff options
author | 2021-11-12 19:26:04 +0000 | |
---|---|---|
committer | 2021-11-12 19:26:04 +0000 | |
commit | 94e8a651fa70e2e6819fb959214dce1ae401f578 (patch) | |
tree | f9a35b23ea739a55c170325a55ee9a785fcdf0f1 /rust/testing.go | |
parent | 4220a61349ad74360c35cf4e4be0d18b75492139 (diff) | |
parent | 62cd0388eb846f5b1dbcc7a1f3d71ae8a823e579 (diff) |
Merge changes I26198187,Ia904d07b
* changes:
rust: Support MTE memtag_heap sanitizer
rust: Support global sanitizers
Diffstat (limited to 'rust/testing.go')
-rw-r--r-- | rust/testing.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rust/testing.go b/rust/testing.go index 94cdd9dcd..abcf23544 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -151,7 +151,12 @@ func GatherRequiredDepsForTest() string { no_libcrt: true, nocrt: true, system_shared_libs: [], - export_include_dirs: ["libprotobuf-cpp-full-includes"], + } + cc_library { + name: "libclang_rt.hwasan_static-aarch64-android", + no_libcrt: true, + nocrt: true, + system_shared_libs: [], } rust_library { name: "libstd", @@ -246,5 +251,8 @@ func registerRequiredBuildComponentsForTest(ctx android.RegistrationContext) { ctx.BottomUp("rust_begin", BeginMutator).Parallel() }) ctx.RegisterSingletonType("rust_project_generator", rustProjectGeneratorSingleton) + ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { + ctx.BottomUp("rust_sanitizers", rustSanitizerRuntimeMutator).Parallel() + }) registerRustSnapshotModules(ctx) } |