diff options
| author | Matthew Maurer <mmaurer@google.com> | 2020-06-23 14:28:53 -0700 |
|---|---|---|
| committer | Matthew Maurer <mmaurer@google.com> | 2020-07-01 11:27:12 -0700 |
| commit | 2ae0513a8e4f226c2161fb89e85ef997b0881278 (patch) | |
| tree | 96461712a9596a4c14dc38e6f6f2c9e1ab3a97d7 /rust/testing.go | |
| parent | 128f53b3b471b969209f7208acca55a80f14c702 (diff) | |
rust: Change default variants
rust_library now produces only rlib and dylib variants.
rust_library_foreign now produces static and shared variants.
This change was made because both are common cases, but all four
together essentially never happens. This allows us to have fewer repeat
module definitions.
Bug: 143217452
Test: cd external/rust; mma
Change-Id: Iaf69e8da38f7c12710331c51464699cf7cbbb656
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/rust/testing.go b/rust/testing.go index 4e186d350..00cd80798 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -83,15 +83,17 @@ func CreateTestContext() *android.TestContext { ctx.RegisterModuleType("rust_test", RustTestFactory) ctx.RegisterModuleType("rust_test_host", RustTestHostFactory) ctx.RegisterModuleType("rust_library", RustLibraryFactory) + ctx.RegisterModuleType("rust_library_dylib", RustLibraryDylibFactory) + ctx.RegisterModuleType("rust_library_rlib", RustLibraryRlibFactory) ctx.RegisterModuleType("rust_library_host", RustLibraryHostFactory) - ctx.RegisterModuleType("rust_library_host_rlib", RustLibraryRlibHostFactory) ctx.RegisterModuleType("rust_library_host_dylib", RustLibraryDylibHostFactory) - ctx.RegisterModuleType("rust_library_rlib", RustLibraryRlibFactory) - ctx.RegisterModuleType("rust_library_dylib", RustLibraryDylibFactory) - ctx.RegisterModuleType("rust_library_shared", RustLibrarySharedFactory) - ctx.RegisterModuleType("rust_library_static", RustLibraryStaticFactory) - ctx.RegisterModuleType("rust_library_host_shared", RustLibrarySharedHostFactory) - ctx.RegisterModuleType("rust_library_host_static", RustLibraryStaticHostFactory) + ctx.RegisterModuleType("rust_library_host_rlib", RustLibraryRlibHostFactory) + ctx.RegisterModuleType("rust_ffi", RustFFIFactory) + ctx.RegisterModuleType("rust_ffi_shared", RustFFISharedFactory) + ctx.RegisterModuleType("rust_ffi_static", RustFFIStaticFactory) + ctx.RegisterModuleType("rust_ffi_host", RustFFIHostFactory) + ctx.RegisterModuleType("rust_ffi_host_shared", RustFFISharedHostFactory) + ctx.RegisterModuleType("rust_ffi_host_static", RustFFIStaticHostFactory) ctx.RegisterModuleType("rust_proc_macro", ProcMacroFactory) ctx.RegisterModuleType("rust_prebuilt_dylib", PrebuiltDylibFactory) ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { |