Skip to content

Commit

Permalink
[7.1.0] Split StableSort into a separate target. (#21152)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tjgq authored Jan 31, 2024
1 parent bc17397 commit 0ba88b5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/main/java/com/google/devtools/build/lib/exec/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
"//src/main/protobuf:spawn_java_proto",
"//third_party:guava",
],
)

java_library(
name = "spawn_runner",
srcs = [
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/google/devtools/build/lib/exec/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,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",
Expand Down

0 comments on commit 0ba88b5

Please sign in to comment.