commit 9e3ccd4a25cc09943ea2dd132a51e5171e266bb7
author Googler <noreply@google.com> Tue May 10 07:17:03 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 10 07:18:10 2022 -0700
tree 36ffdee93c17846948309e5b2810e191465c6385
parent 2f1ff6fa17c3c30b2533bffe81f40eab06b453b9

using constraint values in @platforms

https://github.com/bazelbuild/bazel/issues/8622

PiperOrigin-RevId: 447725613

src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
index 55bb80f..0894852 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
@@ -40,11 +40,10 @@
   // TODO(https://github.com/bazelbuild/bazel/issues/6849): After migration, set the defaults
   // directly.
   public static final Label LEGACY_DEFAULT_HOST_PLATFORM =
-      Label.parseAbsoluteUnchecked("@bazel_tools//platforms:host_platform");
+      Label.parseAbsoluteUnchecked("@local_config_platform//:host");
   public static final Label DEFAULT_HOST_PLATFORM =
       Label.parseAbsoluteUnchecked("@local_config_platform//:host");
-  public static final String DEFAULT_TARGET_PLATFORM_FALLBACK =
-      "@bazel_tools//platforms:target_platform";
+  public static final String DEFAULT_TARGET_PLATFORM_FALLBACK = "@local_config_platform//:host";
 
   /**
    * Main workspace-relative location to use when the user does not explicitly set {@code

src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java
index 14363d4..4d041de 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java
@@ -228,7 +228,7 @@
 
   private static String getPlatformCpuLabel(String targetCpu) {
     // Create a mapping of CcToolchain CPU values to platform arch constraint values
-    // in @bazel_tools//platforms
+    // in @platforms//cpu
     switch (targetCpu) {
       case "x86":
         return "x86_32";

src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
index c6faf82..1a44777 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
@@ -93,7 +93,6 @@
       scratch.file("platforms_workspace/WORKSPACE", "workspace(name = 'platforms')");
       MockPlatformSupport.setup(
           mockToolsConfig,
-          "@bazel_tools//platforms",
           "embedded_tools/platforms",
           "@platforms//",
           "platforms_workspace");

src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
index 2cf3c9c..e9b9432 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
@@ -25,7 +25,6 @@
   public static void setup(MockToolsConfig mockToolsConfig) throws IOException {
     setup(
         mockToolsConfig,
-        TestConstants.PLATFORM_PACKAGE_ROOT,
         TestConstants.PLATFORMS_PATH,
         TestConstants.CONSTRAINTS_PACKAGE_ROOT,
         TestConstants.CONSTRAINTS_PATH);
@@ -34,7 +33,6 @@
   /** Adds mocks for basic host and target platform. */
   public static void setup(
       MockToolsConfig mockToolsConfig,
-      String platformPackageRoot,
       String platformsPath,
       String constraintsPackageRoot,
       String constraintsPath)

src/test/shell/bazel/workspace_test.sh

diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index cea673f..144610e 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -907,7 +907,7 @@
 
 platform(
     name = "my_host_platform",
-    parents = ["@bazel_tools//platforms:host_platform"],
+    parents = ["@local_config_platform//:host"],
     constraint_values = [
         ":large_machine"
     ]

src/test/shell/testenv.sh.tmpl

diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
index e3d255a..8d49fcb 100755
--- a/src/test/shell/testenv.sh.tmpl
+++ b/src/test/shell/testenv.sh.tmpl
@@ -380,7 +380,7 @@
 platform(
     name = "simple",
     constraint_values = [
-        "@bazel_tools//platforms:android",
+        "@platforms//os:android",
         "@platforms//cpu:armv7",
     ],
 )