diff options
| author | 2024-10-23 16:57:06 -0700 | |
|---|---|---|
| committer | 2024-10-24 10:55:33 -0700 | |
| commit | a14fb6a73e2207c1084a0230fd97f08c14ef4818 (patch) | |
| tree | 3300c5bf686fc67e71400ab8bac8c39b5d1c6c0b /rust/rust.go | |
| parent | 11d0c38a2b295774f4c91f8f571323359add9835 (diff) | |
Update DepSet references
Update all references to depset to use blueprint/depset, and to use
DepSet instead of *DepSet.
Bug: 375276086
Test: all soong tests pass
Flag: EXEMPT refactor
Change-Id: I59a7836d0975366ddc336225fb770ac7e6e0c8ea
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rust/rust.go b/rust/rust.go index b22ebf7e7..f987d1146 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -23,6 +23,7 @@ import ( "android/soong/testing" "github.com/google/blueprint" + "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" "android/soong/android" @@ -179,7 +180,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 { @@ -1217,7 +1218,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 +1454,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() |