diff options
| author | 2024-09-26 22:04:11 +0000 | |
|---|---|---|
| committer | 2024-09-26 22:04:11 +0000 | |
| commit | b27645a49c120447d8c23ee4a48fe280a8bf94a6 (patch) | |
| tree | a1e7e12d22728916781cbf6dec88681992cd1001 /java/java.go | |
| parent | 4785b788086dd90083a4bfad9a30b2a8743911bf (diff) | |
| parent | 98e9ac6075d23ac9e06e87bf881bebccbef4505c (diff) | |
Merge "Remove the SdkLibraryDependency interface" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index c6fa663ff..ab11363c1 100644 --- a/java/java.go +++ b/java/java.go @@ -2696,7 +2696,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { transitiveBootClasspathHeaderJars = append(transitiveBootClasspathHeaderJars, dep.TransitiveStaticLibsHeaderJars) } } - } else if _, ok := module.(SdkLibraryDependency); ok { + } else if _, ok := android.OtherModuleProvider(ctx, module, SdkLibraryInfoProvider); ok { switch tag { case libTag, sdkLibTag: sdkInfo, _ := android.OtherModuleProvider(ctx, module, SdkLibraryInfoProvider) @@ -3307,7 +3307,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module, depName := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(depModule)) var sdkLib *string - if lib, ok := depModule.(SdkLibraryDependency); ok && lib.sharedLibrary() { + if lib, ok := android.OtherModuleProvider(ctx, depModule, SdkLibraryInfoProvider); ok && lib.SharedLibrary { // A shared SDK library. This should be added as a top-level CLC element. sdkLib = &depName } else if lib, ok := depModule.(SdkLibraryComponentDependency); ok && lib.OptionalSdkLibraryImplementation() != nil { |