commit 09da33b417e798cd0059a88dcfd4634af91e6322
author Googler <hvd@google.com> Sat Dec 10 07:56:19 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Sat Dec 10 07:57:21 2022 -0800
tree b368ee1c6ef7e16b3785716db7ccad9ca27e009b
parent 0cc796aa2722bad60f314d1b27403dc0c30bf520

Automated rollback of commit d3df5eff49c18bce9f6340e8f6eca3fa2dbd8dcc.

*** Reason for rollback ***

Widespread breakages in the nightly TGP

*** Original change description ***

Dereference alias chains in java_common.target_kind()

PiperOrigin-RevId: 494394949
Change-Id: Iae6d21e7eda3b0434277ef56d4bd9a6b65155f5c

src/main/java/com/google/devtools/build/lib/rules/java/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
index 4216389..65edd8c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -151,7 +151,6 @@
         "//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_options",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/invalid_configuration_exception",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/toolchain_type_requirement",
-        "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
         "//src/main/java/com/google/devtools/build/lib/analysis:file_provider",
         "//src/main/java/com/google/devtools/build/lib/analysis:package_specification_provider",
         "//src/main/java/com/google/devtools/build/lib/analysis:platform_options",

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 f0bc1d4..70e8bda 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
@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.configuredtargets.AbstractConfiguredTarget;
 import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget;
@@ -353,9 +352,6 @@
     if (target instanceof MergedConfiguredTarget) {
       target = ((MergedConfiguredTarget) target).getBaseConfiguredTarget();
     }
-    if (target instanceof ConfiguredTarget) {
-      target = ((ConfiguredTarget) target).getActual();
-    }
     if (target instanceof AbstractConfiguredTarget) {
       return ((AbstractConfiguredTarget) target).getRuleClassString();
     }