diff options
| author | 2024-12-03 22:01:34 +0000 | |
|---|---|---|
| committer | 2024-12-03 22:01:34 +0000 | |
| commit | 5c725564ac7169fa50a9dbe343739e69457d6f2f (patch) | |
| tree | b29547cbe3d12e1bd12fc18c6ea73649f8504864 /apex/apex.go | |
| parent | c068d53883aa23ebdfe37236079b77a35ae956d5 (diff) | |
| parent | 820ab8b5f36d60747e60322d105ccb1e6998861c (diff) | |
Merge "Change checkJavaStableSdkVersion to use ModuleProxy." into main am: 820ab8b5f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3390004
Change-Id: If33b7359335f214aa9825ade2ac40df0fa349719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apex/apex.go b/apex/apex.go index f3b3d5b64..fbb524f2e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2635,16 +2635,12 @@ func (a *apexBundle) checkClasspathFragments(ctx android.ModuleContext) { func (a *apexBundle) checkJavaStableSdkVersion(ctx android.ModuleContext) { // Visit direct deps only. As long as we guarantee top-level deps are using stable SDKs, // java's checkLinkType guarantees correct usage for transitive deps - ctx.VisitDirectDeps(func(module android.Module) { + ctx.VisitDirectDepsProxy(func(module android.ModuleProxy) { tag := ctx.OtherModuleDependencyTag(module) switch tag { case javaLibTag, androidAppTag: - if m, ok := module.(interface { - CheckStableSdkVersion(ctx android.BaseModuleContext) error - }); ok { - if err := m.CheckStableSdkVersion(ctx); err != nil { - ctx.ModuleErrorf("cannot depend on \"%v\": %v", ctx.OtherModuleName(module), err) - } + if err := java.CheckStableSdkVersion(ctx, module); err != nil { + ctx.ModuleErrorf("cannot depend on \"%v\": %v", ctx.OtherModuleName(module), err) } } }) |