Update tests that pass javabase and java_toolchain flags to use toolchain resolution
In particular, use the new starlark java_toolchain_alias and java_runtime_alias rules,
and pass --platforms to tests that override --java_toolchain or --javabase.
PiperOrigin-RevId: 241773704
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index 93ba5d7..bb7d069 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -18,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.packages.BuilderFactoryForTesting;
-import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
/**
@@ -130,8 +129,10 @@
public static final String CC_DEPENDENCY_CORRECTION =
" - deps(" + TOOLS_REPOSITORY + CROSSTOOL_LABEL + ")";
+ public static final String PLATFORM_BASE = "@bazel_tools//platforms";
+
public static final String PLATFORM_LABEL =
- "@bazel_tools//platforms:host_platform + @bazel_tools//platforms:target_platform";
+ PLATFORM_BASE + ":host_platform + " + PLATFORM_BASE + ":target_platform";
/** A choice of test execution mode, only varies internally. */
public enum InternalTestExecutionMode {