commit 74c8ca4886cfc188d60a18e796743e842f675842
author Googler <wyv@google.com> Fri Mar 29 12:48:51 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Mar 29 12:50:29 2024 -0700
tree 138d12fe66c7e2f41f53ba7106aa67fd520114f8
parent bb2e1187cd36f27e364bcd4aa238c39272f07393

Use the `host_platform` from `@platforms` in Bazel

* Upgrade to `platforms` 0.0.9
* `--host_platform` now defaults to `@bazel_tools//tools:host_platform`, which is an alias of `@platforms//host`
* `local_config_platform` (the repo rule) now just outputs a thin wrapper; `@local_config_platform//:host` is an alias of `@platforms//host`, and `@local_config_platform//:constraints.bzl` re-exports `@platforms//host:constraints.bzl`
* Removed all test mocks of `local_config_platform`. A follow-up will guard prod usage behind a flag.

Work towards https://github.com/bazelbuild/bazel/issues/8766 and https://github.com/bazelbuild/bazel/issues/18285.

PiperOrigin-RevId: 620316973
Change-Id: I6593f62569f31faee69e88a520a0f7f42009e05d

src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java

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 1a1fff6..09ee8d6 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
@@ -146,8 +146,8 @@
    */
   public static final ImmutableList<String> PRODUCT_SPECIFIC_FLAGS =
       ImmutableList.of(
-          "--platforms=@local_config_platform//:host",
-          "--host_platform=@local_config_platform//:host",
+          "--platforms=@bazel_tools//tools:host_platform",
+          "--host_platform=@bazel_tools//tools:host_platform",
           // TODO(#7849): Remove after flag flip.
           "--incompatible_use_toolchain_resolution_for_java_rules");
 
@@ -159,15 +159,13 @@
   public static final String APPLE_PLATFORM_PATH = "build_bazel_apple_support/platforms";
   public static final String APPLE_PLATFORM_PACKAGE_ROOT = "@build_bazel_apple_support//platforms";
   public static final String CONSTRAINTS_PACKAGE_ROOT = "@platforms//";
-  public static final String LOCAL_CONFIG_PLATFORM_PACKAGE_ROOT =
-      "@local_config_platform//";
 
   public static final String PLATFORMS_PATH = "embedded_tools/platforms";
   public static final String CONSTRAINTS_PATH = "platforms_workspace";
-  public static final String LOCAL_CONFIG_PLATFORM_PATH = "local_config_platform_workspace";
 
-  public static final String PLATFORM_LABEL =
-      LOCAL_CONFIG_PLATFORM_PACKAGE_ROOT + ":host";
+  public static final String PLATFORM_LABEL = "@platforms//host";
+  public static final String PLATFORM_LABEL_ALIAS = "@bazel_tools//tools:host_platform";
+  public static final String PIII_PLATFORM_LABEL = "@platforms//host:piii";
 
   public static final Label ANDROID_DEFAULT_SDK =
      Label.parseCanonicalUnchecked("@bazel_tools//tools/android:sdk");