diff options
| author | 2024-09-25 23:42:30 +0000 | |
|---|---|---|
| committer | 2024-09-26 17:49:18 +0000 | |
| commit | 98e9ac6075d23ac9e06e87bf881bebccbef4505c (patch) | |
| tree | 56d552843c626db25d4bd75e4f2cb28cfd0cc579 /java/base.go | |
| parent | 1c4625a5ec6f6726ca44962947e6e353077c05de (diff) | |
Remove the SdkLibraryDependency interface
Instead, provide the information of the source/prebuilt java_sdk_library
to the rdeps via the SdkLibraryInfoProvider.
Test: m nothing --no-skip-soong-tests && diff ninja file
Bug: 348040422
Change-Id: If6cd3cd260a8ce8dccead7f302840cabf68a9fae
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/base.go b/java/base.go index b64eb5b61..df523b7e3 100644 --- a/java/base.go +++ b/java/base.go @@ -2414,10 +2414,9 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { return } - if _, ok := module.(SdkLibraryDependency); ok { + if sdkInfo, ok := android.OtherModuleProvider(ctx, module, SdkLibraryInfoProvider); ok { switch tag { case sdkLibTag, libTag, staticLibTag: - sdkInfo, _ := android.OtherModuleProvider(ctx, module, SdkLibraryInfoProvider) generatingLibsString := android.PrettyConcat( getGeneratingLibs(ctx, j.SdkVersion(ctx), module.Name(), sdkInfo), true, "or") ctx.ModuleErrorf("cannot depend directly on java_sdk_library %q; try depending on %s instead", module.Name(), generatingLibsString) @@ -2749,7 +2748,7 @@ func collectDirectDepsProviders(ctx android.ModuleContext) (result *JarJarProvid if IsJniDepTag(tag) || tag == certificateTag || tag == proguardRaiseTag { return RenameUseExclude, "tags" } - if _, ok := m.(SdkLibraryDependency); ok { + if _, ok := android.OtherModuleProvider(ctx, m, SdkLibraryInfoProvider); ok { switch tag { case sdkLibTag, libTag: return RenameUseExclude, "sdklibdep" // matches collectDeps() |