diff options
| author | 2025-02-25 12:55:33 -0800 | |
|---|---|---|
| committer | 2025-02-25 12:55:33 -0800 | |
| commit | d272a622e908736b01bf731dc653aadc47c64971 (patch) | |
| tree | 35ddbe0592ca3f0a703c2d39b8747729590e809d /java/support_libraries.go | |
| parent | 89dab88cc55d9ab0ff85d0a30780ad182cdaf214 (diff) | |
| parent | 2a815b6d8ea8f29b54f780b1219c28b0c8c977aa (diff) | |
Merge "Convert the following singletons to use ModuleProxy:" into main
Diffstat (limited to 'java/support_libraries.go')
| -rw-r--r-- | java/support_libraries.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/java/support_libraries.go b/java/support_libraries.go index c483fc17a..f76eb116e 100644 --- a/java/support_libraries.go +++ b/java/support_libraries.go @@ -28,7 +28,7 @@ func init() { func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) { var supportAars, supportJars []string - ctx.VisitAllModules(func(module android.Module) { + ctx.VisitAllModuleProxies(func(module android.ModuleProxy) { dir := ctx.ModuleDir(module) switch { case strings.HasPrefix(dir, "prebuilts/sdk/current/extras"), @@ -47,11 +47,16 @@ func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) { return } - switch module.(type) { - case *AndroidLibrary, *AARImport: + _, isAndroidLibrary := android.OtherModuleProvider(ctx, module, AndroidLibraryInfoProvider) + _, isAARImport := android.OtherModuleProvider(ctx, module, AARImportInfoProvider) + if isAndroidLibrary || isAARImport { supportAars = append(supportAars, name) - case *Library, *Import: - supportJars = append(supportJars, name) + } else { + _, isJavaLibrary := android.OtherModuleProvider(ctx, module, JavaLibraryInfoProvider) + _, isJavaPlugin := android.OtherModuleProvider(ctx, module, JavaPluginInfoProvider) + if isJavaLibrary && !isJavaPlugin { + supportJars = append(supportJars, name) + } } }) |