Skip to content

Commit

Permalink
[7.1.0] Split StableSort into a separate target.
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 committed Jan 31, 2024
1 parent a6d410a commit a2bab0b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
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
2 changes: 1 addition & 1 deletion src/test/java/com/google/devtools/build/lib/exec/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit a2bab0b

Please sign in to comment.