Remove dependencies on the deprecated target build/lib:build-base.
PiperOrigin-RevId: 309208152
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index 9ea726a..d030cab 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -26,8 +26,9 @@
tags = ["skyframe"],
visibility = ["//src/test/java/com/google/devtools/build/lib:__subpackages__"],
deps = [
- "//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/build_configuration",
+ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
"//src/main/java/com/google/devtools/build/lib/bazel:main",
"//src/main/java/com/google/devtools/build/lib/bazel/rules",
"//src/main/java/com/google/devtools/build/lib/clock",
@@ -37,6 +38,10 @@
"//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/rules/platform",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_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/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
"//src/main/java/com/google/devtools/build/lib/util/io",
@@ -82,9 +87,18 @@
runtime_deps = [
"//src/test/java/com/google/devtools/build/lib:test_runner",
],
- deps = [
+ deps = select({
+ "//src/conditions:darwin": [
+ "//src/main/java/com/google/devtools/build/lib/skyframe:incompatible_view_exception",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:local_diff_awareness",
+ ],
+ "//src/conditions:darwin_x86_64": [
+ "//src/main/java/com/google/devtools/build/lib/skyframe:incompatible_view_exception",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:local_diff_awareness",
+ ],
+ "//conditions:default": [],
+ }) + [
":testutil",
- "//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib:build-request-options",
"//src/main/java/com/google/devtools/build/lib:keep-going-option",
"//src/main/java/com/google/devtools/build/lib:runtime",
@@ -92,6 +106,34 @@
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
"//src/main/java/com/google/devtools/build/lib/actionsketch:action_sketch",
+ "//src/main/java/com/google/devtools/build/lib/analysis:actions/custom_command_line",
+ "//src/main/java/com/google/devtools/build/lib/analysis:actions/spawn_action_template",
+ "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
+ "//src/main/java/com/google/devtools/build/lib/analysis:analysis_options",
+ "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/build_configuration",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/build_options",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/compilation_mode",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/config_matching_provider",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/core_options",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/fragment",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_options",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transition_factories",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/composing_transition",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/configuration_transition",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/no_transition",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/patch_transition",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/split_transition",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/transition_factory",
+ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
+ "//src/main/java/com/google/devtools/build/lib/analysis:dependency",
+ "//src/main/java/com/google/devtools/build/lib/analysis:dependency_kind",
+ "//src/main/java/com/google/devtools/build/lib/analysis:platform_options",
+ "//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
+ "//src/main/java/com/google/devtools/build/lib/analysis:test/test_configuration",
+ "//src/main/java/com/google/devtools/build/lib/analysis:top_level_artifact_context",
+ "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_provider",
+ "//src/main/java/com/google/devtools/build/lib/analysis:view_creation_failed_exception",
"//src/main/java/com/google/devtools/build/lib/analysis/platform",
"//src/main/java/com/google/devtools/build/lib/bazel:main",
"//src/main/java/com/google/devtools/build/lib/bazel/rules",
@@ -102,13 +144,90 @@
"//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/events",
+ "//src/main/java/com/google/devtools/build/lib/exec:bin_tools",
+ "//src/main/java/com/google/devtools/build/lib/exec:single_build_file_cache",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/packages:build_type",
"//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
"//src/main/java/com/google/devtools/build/lib/packages:type",
"//src/main/java/com/google/devtools/build/lib/pkgcache",
"//src/main/java/com/google/devtools/build/lib/remote/options",
+ "//src/main/java/com/google/devtools/build/lib/rules:repository/local_repository_rule",
+ "//src/main/java/com/google/devtools/build/lib/rules:repository/managed_directories_knowledge_impl",
+ "//src/main/java/com/google/devtools/build/lib/rules:repository/repository_function",
+ "//src/main/java/com/google/devtools/build/lib/rules:repository/repository_loader_function",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_execution_inactivity_watchdog",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_execution_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_metadata_handler",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_sketch_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_template_expansion_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:action_template_expansion_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:aggregating_artifact_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:artifact_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:aspect_value_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ast_file_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:broken_diff_awareness_exception",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:builder",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:cached_starlark_import_lookup_value_and_deps",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:cached_starlark_import_lookup_value_and_deps_builder_factory",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:collect_packages_under_directory_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_and_data",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_progress_receiver",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:containing_package_lookup_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:containing_package_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:diff_awareness",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:diff_awareness_manager",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_state_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_symlink_cycle_exception",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_symlink_cycle_uniqueness_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_symlink_infinite_expansion_exception",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_symlink_infinite_expansion_uniqueness_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:fileset_entry_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:fileset_entry_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:fileset_entry_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:filesystem_value_checker",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:glob_descriptor",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:glob_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:glob_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:local_repository_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:managed_directories_knowledge",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:minimal_output_store",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:output_store",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_error_message_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_progress_receiver",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:package_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:prepare_deps_of_pattern_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:prepare_deps_of_patterns_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:prepare_deps_of_targets_under_directory_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:recursive_filesystem_traversal",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:recursive_pkg_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:recursive_pkg_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:repository_mapping_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_aware_action",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:starlark_import_lookup_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_phase_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:tests_for_target_pattern_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:top_down_action_cache",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_base_traversal_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_target_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:tree_artifact_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_ast_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
@@ -168,12 +287,20 @@
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
":testutil",
- "//src/main/java/com/google/devtools/build/lib:build-base",
"//src/main/java/com/google/devtools/build/lib/actions",
+ "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
+ "//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//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/pkgcache",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_state_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:file_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:path_casing_lookup_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:path_casing_lookup_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/serialization",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
