Untangle the hairball a little bit by splitting up two source files (which will help
us to split it further).
PiperOrigin-RevId: 434997472
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index fb3ae27..8cda1c7 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -98,6 +98,7 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:prepare_deps_of_patterns_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:recursive_package_provider_backed_target_pattern_resolver",
"//src/main/java/com/google/devtools/build/lib/skyframe:recursive_pkg_value_root_package_extractor",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:rule_configured_target_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_value",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index b3bcaa0..9aeb476 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -40,7 +40,6 @@
"FileStateFunction.java",
"HighWaterMarkLimiter.java",
"LocalRepositoryLookupFunction.java",
- "NonRuleConfiguredTargetValue.java",
"PackageFunction.java",
"PlatformLookupUtil.java",
"PlatformMappingFunction.java",
@@ -52,7 +51,6 @@
"RegisteredToolchainsCycleReporter.java",
"RegisteredToolchainsFunction.java",
"RegisteredToolchainsValue.java",
- "RuleConfiguredTargetValue.java",
"SequencedSkyframeExecutor.java",
"SequencedSkyframeExecutorFactory.java",
"SingleToolchainResolutionFunction.java",
@@ -180,6 +178,7 @@
":recursive_pkg_value",
":repository_mapping_function",
":repository_mapping_value",
+ ":rule_configured_target_value",
":sane_analysis_exception",
":sky_functions",
":sky_value_dirtiness_checker",
@@ -272,7 +271,6 @@
"//src/main/java/com/google/devtools/build/lib/analysis:platform_configuration",
"//src/main/java/com/google/devtools/build/lib/analysis:platform_options",
"//src/main/java/com/google/devtools/build/lib/analysis:resolved_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/analysis:rule_configured_object_value",
"//src/main/java/com/google/devtools/build/lib/analysis:target_and_configuration",
"//src/main/java/com/google/devtools/build/lib/analysis:toolchain_collection",
"//src/main/java/com/google/devtools/build/lib/analysis:toolchain_context",
@@ -2963,3 +2961,24 @@
name = "already_reported_exception",
srcs = ["AlreadyReportedException.java"],
)
+
+java_library(
+ name = "rule_configured_target_value",
+ srcs = [
+ "NonRuleConfiguredTargetValue.java",
+ "RuleConfiguredTargetValue.java",
+ ],
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
+ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
+ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target_value",
+ "//src/main/java/com/google/devtools/build/lib/analysis:rule_configured_object_value",
+ "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ "//src/main/java/com/google/devtools/build/lib/concurrent",
+ "//src/main/java/com/google/devtools/build/lib/packages",
+ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ ],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
index eb58d1e..be7f5b8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -96,6 +96,7 @@
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:rule_configured_target_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/test/java/com/google/devtools/build/lib/actions/util",
