Fix java_common.target_kind when aspects are involved

PiperOrigin-RevId: 412242583
EngFlow · Nov 25, 2021 · 748b996 · 748b996
1 parent 0a93c1f
commit 748b996
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/...java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -273,7 +273,7 @@ public Dict<String, Object> getProvidersDict() {
   }
 
   @VisibleForTesting
-  public ConfiguredTarget getBaseConfiguredTargetForTesting() {
+  public ConfiguredTarget getBaseConfiguredTarget() {
     return base;
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.configuredtargets.AbstractConfiguredTarget;
+import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget;
 import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext;
@@ -297,6 +298,9 @@ public ProviderApi getBootClassPathInfo() {
   @Override
   public String getTargetKind(Object target, StarlarkThread thread) throws EvalException {
     checkPrivateAccess(thread);
+    if (target instanceof MergedConfiguredTarget) {
+      target = ((MergedConfiguredTarget) target).getBaseConfiguredTarget();
+    }
     if (target instanceof AbstractConfiguredTarget) {
       return ((AbstractConfiguredTarget) target).getRuleClassString();
     }