Move target pattern work to new util class

Change-Id: Ib1a29a927fa6fd3f49e03efa3b73e1547df6cacd
PiperOrigin-RevId: 204993474

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
index 4ec5e7faca..ae7697641d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
@@ -69,12 +69,12 @@ public class RegisteredExecutionPlatformsFunction implements SkyFunction {
     ImmutableList<Label> platformLabels;
     try {
       platformLabels =
-          ToolchainUtil.expandTargetPatterns(
+          TargetPatternUtil.expandTargetPatterns(
               env, targetPatterns.build(), FilteringPolicies.ruleType("platform", true));
       if (env.valuesMissing()) {
         return null;
       }
-    } catch (ToolchainUtil.InvalidTargetPatternException e) {
+    } catch (TargetPatternUtil.InvalidTargetPatternException e) {
       throw new RegisteredExecutionPlatformsFunctionException(
           new InvalidExecutionPlatformLabelException(e), Transience.PERSISTENT);
     }
@@ -144,7 +144,8 @@ public class RegisteredExecutionPlatformsFunction implements SkyFunction {
    */
   static final class InvalidExecutionPlatformLabelException extends Exception {
 
-    public InvalidExecutionPlatformLabelException(ToolchainUtil.InvalidTargetPatternException e) {
+    public InvalidExecutionPlatformLabelException(
+        TargetPatternUtil.InvalidTargetPatternException e) {
       this(e.getInvalidPattern(), e.getTpe());
     }