diff options
| author | 2024-09-23 18:21:01 +0000 | |
|---|---|---|
| committer | 2024-09-23 18:21:01 +0000 | |
| commit | 2d404031e7964ab809ac64cf60fba787fc0ee87f (patch) | |
| tree | 773ffa97d09dfe88d39aebeabe5c181dd07edcd6 /java/java.go | |
| parent | 2625680b509007fff836d9063e3e82d24f02c374 (diff) | |
| parent | a7906c717cda2f0360efda8dfd4045b57215a185 (diff) | |
Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main am: 1a7d900c78 am: a7906c717c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272004
Change-Id: I3893d25882248f645c37718793907b7a1a64f0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) } } |