diff options
| author | 2024-10-24 19:16:05 +0000 | |
|---|---|---|
| committer | 2024-10-24 19:16:05 +0000 | |
| commit | 1c841c4ca01432a381dcda05820c015d208a9802 (patch) | |
| tree | 5b3bb328576b915880265a7dfe159629848fecc8 /rust/rust.go | |
| parent | 830f56a78e91ba02314edd6937fcf73f937635ba (diff) | |
| parent | a14fb6a73e2207c1084a0230fd97f08c14ef4818 (diff) | |
Merge changes from topic "move-depset" into main
* changes:
Update DepSet references
Move DepSet to blueprint
Convert DepSet to a wrapper around a pointer
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 a1fed3e6b..6b91ccb25 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -22,6 +22,7 @@ import ( "android/soong/bloaty" "github.com/google/blueprint" + "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" "android/soong/android" @@ -178,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 { @@ -1213,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) { @@ -1449,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() |