diff options
| author | 2025-02-13 02:05:00 +0000 | |
|---|---|---|
| committer | 2025-02-19 00:18:39 +0000 | |
| commit | 0a37d429bcbfdf5110bbfcf14f43764dc01585a4 (patch) | |
| tree | acda2280ff7ee8cd210a9696b615297d64c4d5b4 /java/base.go | |
| parent | 9354e34a7b2ba36b1e611dc0f062416649decbeb (diff) | |
Change depVisitor to use providers instead of type-asserting to
interfaces directly, the next step is to change it to use ModuleProxy
once IsDepInSameApex is ready.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I13a4e256a26dbf7f9b3b746d628ac8f68b4e598e
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/base.go b/java/base.go index 21ad73f84..fccc80691 100644 --- a/java/base.go +++ b/java/base.go @@ -658,11 +658,11 @@ func (j *Module) checkSdkVersions(ctx android.ModuleContext) { // See rank() for details. ctx.VisitDirectDepsProxy(func(module android.ModuleProxy) { tag := ctx.OtherModuleDependencyTag(module) - _, isJavaLibrary := android.OtherModuleProvider(ctx, module, JavaLibraryInfoProvider) + libInfo, isJavaLibrary := android.OtherModuleProvider(ctx, module, JavaLibraryInfoProvider) _, isAndroidLibrary := android.OtherModuleProvider(ctx, module, AndroidLibraryInfoProvider) _, isJavaAconfigLibrary := android.OtherModuleProvider(ctx, module, android.CodegenInfoProvider) // Exclude java_aconfig_library modules to maintain consistency with existing behavior. - if (isJavaLibrary && !isJavaAconfigLibrary) || isAndroidLibrary { + if (isJavaLibrary && !libInfo.Prebuilt && !isJavaAconfigLibrary) || isAndroidLibrary { // TODO(satayev): cover other types as well, e.g. imports switch tag { case bootClasspathTag, sdkLibTag, libTag, staticLibTag, java9LibTag: |