diff options
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rust/testing.go b/rust/testing.go index 32cc82354..2082b524e 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -80,7 +80,6 @@ func GatherRequiredDepsForTest() string { no_libcrt: true, nocrt: true, system_shared_libs: [], - apex_available: ["//apex_available:platform", "//apex_available:anyapex"], min_sdk_version: "29", vendor_available: true, host_supported: true, @@ -88,6 +87,13 @@ func GatherRequiredDepsForTest() string { llndk: { symbol_file: "liblog.map.txt", }, + stubs: { + symbol_file: "liblog.map.txt", + versions: [ + "29", + "30", + ], + }, } cc_library { name: "libprotobuf-cpp-full", @@ -188,12 +194,10 @@ func registerRequiredBuildComponentsForTest(ctx android.RegistrationContext) { ctx.RegisterModuleType("rust_fuzz_host", RustFuzzHostFactory) ctx.RegisterModuleType("rust_ffi", RustFFIFactory) ctx.RegisterModuleType("rust_ffi_shared", RustFFISharedFactory) - ctx.RegisterModuleType("rust_ffi_rlib", RustFFIRlibFactory) - ctx.RegisterModuleType("rust_ffi_static", RustFFIRlibFactory) + ctx.RegisterModuleType("rust_ffi_static", RustLibraryRlibFactory) ctx.RegisterModuleType("rust_ffi_host", RustFFIHostFactory) ctx.RegisterModuleType("rust_ffi_host_shared", RustFFISharedHostFactory) - ctx.RegisterModuleType("rust_ffi_host_rlib", RustFFIRlibHostFactory) - ctx.RegisterModuleType("rust_ffi_host_static", RustFFIRlibHostFactory) + ctx.RegisterModuleType("rust_ffi_host_static", RustLibraryRlibHostFactory) ctx.RegisterModuleType("rust_proc_macro", ProcMacroFactory) ctx.RegisterModuleType("rust_protobuf", RustProtobufFactory) ctx.RegisterModuleType("rust_protobuf_host", RustProtobufHostFactory) |