diff options
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 86 |
1 files changed, 17 insertions, 69 deletions
diff --git a/rust/testing.go b/rust/testing.go index e7fb9fa2b..1b34dfe8e 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -53,74 +53,14 @@ var PrepareForTestWithRustIncludeVndk = android.GroupFixturePreparers( func GatherRequiredDepsForTest() string { bp := ` rust_prebuilt_library { - name: "libstd_x86_64-unknown-linux-gnu", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_x86_64-unknown-linux-gnu", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libstd_i686-unknown-linux-gnu", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_i686-unknown-linux-gnu", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libstd_x86_64-apple-darwin", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_x86_64-apple-darwin", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, + name: "libstd", + crate_name: "std", + rlib: { + srcs: ["libstd.rlib"], + }, + dylib: { + srcs: ["libstd.so"], + }, host_supported: true, sysroot: true, } @@ -152,7 +92,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", @@ -249,5 +194,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) } |