Skip to content

Commit

Permalink
Automated rollback of commit d3df5ef.
Browse files Browse the repository at this point in the history
*** 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
  • Loading branch information
hvadehra authored and copybara-github committed Dec 10, 2022
1 parent 0cc796a commit 09da33b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ java_library(
"//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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -353,9 +352,6 @@ public String getTargetKind(Object target, StarlarkThread thread) throws EvalExc
if (target instanceof MergedConfiguredTarget) {
target = ((MergedConfiguredTarget) target).getBaseConfiguredTarget();
}
if (target instanceof ConfiguredTarget) {
target = ((ConfiguredTarget) target).getActual();
}
if (target instanceof AbstractConfiguredTarget) {
return ((AbstractConfiguredTarget) target).getRuleClassString();
}
Expand Down

0 comments on commit 09da33b

Please sign in to comment.