diff options
| author | 2024-12-05 14:26:03 -0800 | |
|---|---|---|
| committer | 2024-12-09 13:33:16 -0800 | |
| commit | 9cf55a538b07d2e76b993bf3eb44b2e72f9ddcc3 (patch) | |
| tree | 47634dc50dc6832f747399e4a96489b68671e9f4 | |
| parent | 1a842010981c1cb747199574fd8f60e288bf0eb4 (diff) | |
Convert WalkPayloadDeps from blueprint.Module to android.Module
All modules in Soong are now android.Module, there is no need to
use blueprint.Module.
Test: builds
Change-Id: I859cd6360732e3d195a634736ec515d240323f29
| -rw-r--r-- | android/apex.go | 4 | ||||
| -rw-r--r-- | apex/apex.go | 2 | ||||
| -rw-r--r-- | java/app.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/android/apex.go b/android/apex.go index 49db608a3..f625bafcc 100644 --- a/android/apex.go +++ b/android/apex.go @@ -764,7 +764,7 @@ func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion // Function called while walking an APEX's payload dependencies. // // Return true if the `to` module should be visited, false otherwise. -type PayloadDepsCallback func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool +type PayloadDepsCallback func(ctx BaseModuleContext, from Module, to ApexModule, externalDep bool) bool type WalkPayloadDepsFunc func(ctx BaseModuleContext, do PayloadDepsCallback) // ModuleWithMinSdkVersionCheck represents a module that implements min_sdk_version checks @@ -792,7 +792,7 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl return } - walk(ctx, func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool { + walk(ctx, func(ctx BaseModuleContext, from Module, to ApexModule, externalDep bool) bool { if externalDep { // external deps are outside the payload boundary, which is "stable" // interface. We don't have to check min_sdk_version for external diff --git a/apex/apex.go b/apex/apex.go index acf290365..e22cf9ea6 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2694,7 +2694,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { return } - a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { + a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from android.Module, to android.ApexModule, externalDep bool) bool { // As soon as the dependency graph crosses the APEX boundary, don't go further. if externalDep { return false diff --git a/java/app.go b/java/app.go index bedb45c5e..276e9606d 100644 --- a/java/app.go +++ b/java/app.go @@ -1225,7 +1225,7 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) { } depsInfo := android.DepNameToDepInfoMap{} - a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { + a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from android.Module, to android.ApexModule, externalDep bool) bool { depName := to.Name() // Skip dependencies that are only available to APEXes; they are developed with updatability |