Split ExecGroup into a new target.

PiperOrigin-RevId: 372342357
databricks · Jul 13, 2021 · e376580 · e376580
1 parent de9ff90
commit e376580
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -401,6 +401,7 @@ java_library(
  "//src/main/java/com/google/devtools/build/lib/exec:test_xml_output_parser_exception",
  "//src/main/java/com/google/devtools/build/lib/graph",
  "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/packages/semantics",
  "//src/main/java/com/google/devtools/build/lib/profiler",
  "//src/main/java/com/google/devtools/build/lib/profiler:google-auto-profiler-utils",

diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -16,9 +16,11 @@ java_library(
  ["*.java"],
  exclude = [
  "BuilderFactoryForTesting.java", # see builder_factory_for_testing
+ "ExecGroup.java",
  ],
  ),
  deps = [
+ ":exec_group",
  "//src/main/java/com/google/devtools/build/docgen/annot",
  "//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
  "//src/main/java/com/google/devtools/build/lib/analysis:config/config_matching_provider",
@@ -64,6 +66,18 @@ java_library(
  ],
 )
 
+java_library(
+ name = "exec_group",
+ srcs = ["ExecGroup.java"],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
+ "//third_party:auto_value",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ ],
+)
+
 # TODO(kkress, adonovan) Eliminate this target, it is mostly unecessary. It
 # depends on lib:build-base for BlazeDirectories, which it uses for a type
 # parameter, but the param is unused.

diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -56,6 +56,7 @@ java_library(
  "//src/main/java/com/google/devtools/build/lib/events",
  "//src/main/java/com/google/devtools/build/lib/graph",
  "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/pkgcache",
  "//src/main/java/com/google/devtools/build/lib/pkgcache:QueryTransitivePackagePreloader",
  "//src/main/java/com/google/devtools/build/lib/profiler",

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -273,6 +273,7 @@ java_library(
  "//src/main/java/com/google/devtools/build/lib/concurrent",
  "//src/main/java/com/google/devtools/build/lib/events",
  "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/packages/semantics",
  "//src/main/java/com/google/devtools/build/lib/pkgcache",
  "//src/main/java/com/google/devtools/build/lib/pkgcache:QueryTransitivePackagePreloader",

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/BUILD
@@ -117,6 +117,7 @@ java_library(
  "//src/main/java/com/google/devtools/build/lib/events",
  "//src/main/java/com/google/devtools/build/lib/exec:bin_tools",
  "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/pkgcache",
  "//src/main/java/com/google/devtools/build/lib/rules/android",
  "//src/main/java/com/google/devtools/build/lib/rules/cpp",

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
@@ -89,6 +89,7 @@ java_library(
  "//src/main/java/com/google/devtools/build/lib/events",
  "//src/main/java/com/google/devtools/build/lib/exec:execution_options",
  "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/packages/semantics",
  "//src/main/java/com/google/devtools/build/lib/pkgcache",
  "//src/main/java/com/google/devtools/build/lib/rules:repository/local_repository_rule",

diff --git a/src/test/java/com/google/devtools/build/lib/packages/BUILD b/src/test/java/com/google/devtools/build/lib/packages/BUILD
@@ -65,7 +65,7 @@ java_test(
  "//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/packages",
- "//src/main/java/com/google/devtools/build/lib/packages/semantics",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/pkgcache",
  "//src/main/java/com/google/devtools/build/lib/skyframe:tests_for_target_pattern_value",
  "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",

diff --git a/src/test/java/com/google/devtools/build/lib/starlark/BUILD b/src/test/java/com/google/devtools/build/lib/starlark/BUILD
@@ -52,6 +52,7 @@ java_test(
  "//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/packages",
+ "//src/main/java/com/google/devtools/build/lib/packages:exec_group",
  "//src/main/java/com/google/devtools/build/lib/rules/cpp",
  "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
  "//src/main/java/com/google/devtools/build/lib/rules/objc",