commit ecbf463df764565e6f7eb1c50b46ba58c6148f73
author John Cater <jcater@google.com> Mon Nov 23 05:41:45 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 23 05:42:58 2020 -0800
tree 3c0b58bca402025edeec7fb3cbb0906238e5b1a1
parent a87d7ed2411d5382bac58a20b79e09c464ad13b9

Update classes to get the target platform from PlatformConfiguration

where possible.

Closes #12525.

PiperOrigin-RevId: 343833420

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
index ed95426..935385e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.PlatformOptions;
+import com.google.devtools.build.lib.analysis.PlatformConfiguration;
 import com.google.devtools.build.lib.analysis.ResolvedToolchainContext;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
@@ -163,7 +163,7 @@
                         + " appropriate --platforms value: --platforms=%s",
                     ruleContext.getRuleClassNameForLogging(),
                     ruleContext.getLabel(),
-                    configuration.getOptions().get(PlatformOptions.class).platforms));
+                    configuration.getFragment(PlatformConfiguration.class).getTargetPlatform()));
             return null;
           }
         }

src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java
index b9185be..6c14dc6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java
@@ -153,10 +153,10 @@
         getConfiguration(
             (ConfiguredTarget) ((StructImpl) target.get(key)).getValue("exec_group_dep"));
 
-    assertThat(dep.getOptions().get(PlatformOptions.class).platforms)
-        .containsExactly(Label.parseAbsoluteUnchecked("//platform:platform_1"));
-    assertThat(execGroupDep.getOptions().get(PlatformOptions.class).platforms)
-        .containsExactly(Label.parseAbsoluteUnchecked("//platform:platform_2"));
+    assertThat(dep.getFragment(PlatformConfiguration.class).getTargetPlatform())
+        .isEqualTo(Label.parseAbsoluteUnchecked("//platform:platform_1"));
+    assertThat(execGroupDep.getFragment(PlatformConfiguration.class).getTargetPlatform())
+        .isEqualTo(Label.parseAbsoluteUnchecked("//platform:platform_2"));
   }
 
   @Test