From 189971300d979a1e06223442f2d4ee2663c85961 Mon Sep 17 00:00:00 2001
From: Googler <tjgq@google.com>
Date: Mon, 29 Jan 2024 07:46:40 -0800
Subject: [PATCH] [7.1.0] Split StableSort into a separate target.

This is to allow StableSort (and other utilities to be added soon) to be shared between Bazel and a future log conversion tool, without bringing in unnecessary dependencies for the latter.

PiperOrigin-RevId: 602385146
Change-Id: I29419c2715338a1845f79568d86119033f7ff5ff
---
 .../java/com/google/devtools/build/lib/exec/BUILD   | 13 ++++++++++++-
 .../java/com/google/devtools/build/lib/exec/BUILD   |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/exec/BUILD b/src/main/java/com/google/devtools/build/lib/exec/BUILD
index 7537197c5e4c71..743dfaadec3de1 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/exec/BUILD
@@ -261,9 +261,9 @@ java_library(
         "CompactSpawnLogContext.java",
         "ExpandedSpawnLogContext.java",
         "SpawnLogContext.java",
-        "StableSort.java",
     ],
     deps = [
+        ":spawn_log_context_utils",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
@@ -286,6 +286,17 @@ java_library(
     ],
 )
 
+java_library(
+    name = "spawn_log_context_utils",
+    srcs = ["StableSort.java"],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib/profiler",
+        "//src/main/java/com/google/devtools/build/lib/util/io:io-proto",
+        "//src/main/protobuf:spawn_java_proto",
+        "//third_party:guava",
+    ],
+)
+
 java_library(
     name = "spawn_runner",
     srcs = [
diff --git a/src/test/java/com/google/devtools/build/lib/exec/BUILD b/src/test/java/com/google/devtools/build/lib/exec/BUILD
index 7341ffbf45d9e0..1082b97c1d301a 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/exec/BUILD
@@ -37,7 +37,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
         "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
         "//src/main/java/com/google/devtools/build/lib/clock",
-        "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/events",
         "//src/main/java/com/google/devtools/build/lib/exec:abstract_spawn_strategy",
@@ -50,6 +49,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_exec_exception",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_input_expander",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_log_context",
+        "//src/main/java/com/google/devtools/build/lib/exec:spawn_log_context_utils",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_runner",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_strategy_registry",
         "//src/main/java/com/google/devtools/build/lib/exec:standalone_test_result",