diff options
| author | 2024-09-23 23:01:23 +0000 | |
|---|---|---|
| committer | 2024-09-23 23:01:23 +0000 | |
| commit | 64e4b910004529fd3b1e2d0baba1d912db762224 (patch) | |
| tree | 9648c9671e81f2d41065ca9dabb5f07c01ecd478 /java/java.go | |
| parent | dd256788d59530006dfa6968b14c9bf27ba8324f (diff) | |
| parent | 03369e7f44bca89f1d1057eb579ed3f837e295e6 (diff) | |
Snap for 12404440 from 03369e7f44bca89f1d1057eb579ed3f837e295e6 to 24Q4-release
Change-Id: I94f3473d08dd1c93dbd794fa7471f988e01396c6
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index d63bbe6e1..b6d617377 100644 --- a/java/java.go +++ b/java/java.go @@ -2700,13 +2700,13 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { transitiveBootClasspathHeaderJars = append(transitiveBootClasspathHeaderJars, dep.TransitiveStaticLibsHeaderJars) } } - } else if dep, ok := module.(SdkLibraryDependency); ok { + } else if _, ok := module.(SdkLibraryDependency); ok { switch tag { case libTag, sdkLibTag: - depHeaderJars := dep.SdkHeaderJars(ctx, j.SdkVersion(ctx)) - flags.classpath = append(flags.classpath, depHeaderJars...) - transitiveClasspathHeaderJars = append(transitiveClasspathHeaderJars, - android.NewDepSet(android.PREORDER, depHeaderJars, nil)) + 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) } } |