1 files changed, 19 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/platform/BUILD
index ce3a69d759..e5c4231f14 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/BUILD
@@ -5,11 +5,16 @@ package(
     default_visibility = ["//src:__subpackages__"],
 )
 
+UTIL_SRCS = ["PlatformProviderUtils.java"]
+
 java_library(
     name = "platform",
-    srcs = glob([
-        "*.java",
-    ]),
+    srcs = glob(
+        [
+            "*.java",
+        ],
+        exclude = UTIL_SRCS,
+    ),
     deps = [
         "//src/main/java/com/google/devtools/build/lib:packages",
         "//src/main/java/com/google/devtools/build/lib:skylarkinterface",
@@ -17,6 +22,17 @@ java_library(
     ],
 )
 
+java_library(
+    name = "utils",
+    srcs = UTIL_SRCS,
+    deps = [
+        ":platform",
+        "//src/main/java/com/google/devtools/build/lib:preconditions",
+        "//src/main/java/com/google/devtools/build/lib:skylark-provider-collection",
+        "//third_party:guava",
+    ],
+)
+
 filegroup(
     name = "srcs",
     testonly = 0,  # All srcs should be not test only, overwrite package default.