commit de938e0a4be612b711f2f3b00c053393f43e39d4
author hvd <hvd@google.com> Tue Jan 18 11:36:02 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 18 11:37:52 2022 -0800
tree c198d65b19074a20d1ed3b9c7f0d08680163c926
parent 57549624704e0cbc81c7f5e2eb4d71f456d61baf

Fix java_common.target_kind() to work with aspects

PiperOrigin-RevId: 422607606

src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
index 3166048..0557510 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis.configuredtargets;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.analysis.AnalysisUtils;
@@ -272,8 +271,7 @@
     return ConfiguredTargetsUtil.getProvidersDict(this, nonBaseProviders);
   }
 
-  @VisibleForTesting
-  public ConfiguredTarget getBaseConfiguredTargetForTesting() {
+  public ConfiguredTarget getBaseConfiguredTarget() {
     return base;
   }
 }

src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java

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
index 4ca7a26..1af02db 100644
--- 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
@@ -19,6 +19,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 @@
   @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();
     }