diff options
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/rust/rust.go b/rust/rust.go index b22ebf7e7..6b91ccb25 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -20,9 +20,9 @@ import ( "strings" "android/soong/bloaty" - "android/soong/testing" "github.com/google/blueprint" + "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" "android/soong/android" @@ -179,7 +179,7 @@ type Module struct { // For apex variants, this is set as apex.min_sdk_version apexSdkVersion android.ApiLevel - transitiveAndroidMkSharedLibs *android.DepSet[string] + transitiveAndroidMkSharedLibs depset.DepSet[string] } func (mod *Module) Header() bool { @@ -992,9 +992,6 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { ctx.Phony("rust", ctx.RustModule().OutputFile().Path()) } - if mod.testModule { - android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) - } mod.setOutputFiles(ctx) @@ -1217,7 +1214,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { skipModuleList := map[string]bool{} - var transitiveAndroidMkSharedLibs []*android.DepSet[string] + var transitiveAndroidMkSharedLibs []depset.DepSet[string] var directAndroidMkSharedLibs []string ctx.VisitDirectDeps(func(dep android.Module) { @@ -1453,7 +1450,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { } }) - mod.transitiveAndroidMkSharedLibs = android.NewDepSet[string](android.PREORDER, directAndroidMkSharedLibs, transitiveAndroidMkSharedLibs) + mod.transitiveAndroidMkSharedLibs = depset.New[string](depset.PREORDER, directAndroidMkSharedLibs, transitiveAndroidMkSharedLibs) var rlibDepFiles RustLibraries aliases := mod.compiler.Aliases() |