From 5a4a3404307c9dd4654866e5d225ac9ec7107970 Mon Sep 17 00:00:00 2001
From: Googler
deps
+ at Typical attributes defined by
+ most build rules.
+ */
+ .add(
+ attr("deps", LABEL_LIST)
+ .allowedFileTypes(FileTypeSet.NO_FILE)
+ .mandatoryProviders(CcInfo.PROVIDER.id()))
.add(attr("data", LABEL_LIST).allowedFileTypes(FileTypeSet.ANY_FILE).dontCheckConstraints())
.addToolchainTypes(CppRuleClasses.ccToolchainTypeRequirement(env))
.build();
diff --git a/src/main/native/BUILD b/src/main/native/BUILD
index 2601d3298cfb30..e181e16087a829 100644
--- a/src/main/native/BUILD
+++ b/src/main/native/BUILD
@@ -24,8 +24,8 @@ filegroup(
name = "jni_os",
srcs = select({
"//src/conditions:darwin": [
- "darwin/file_jni.cc",
"darwin/fsevents.cc",
+ "darwin/file_jni.cc",
"darwin/sleep_prevention_jni.cc",
"darwin/system_cpu_speed_monitor_jni.cc",
"darwin/system_disk_space_monitor_jni.cc",
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
index 058a6c5e9f47ae..7e2d2a1461c36e 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -50,8 +50,8 @@ cc_binary(
deps = select({
"//src/conditions:windows": [],
"//conditions:default": [
- ":logging",
":process-tools",
+ ":logging",
],
}),
)
diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD
index 129ea120fe8f76..755c97eb496c8a 100644
--- a/src/test/cpp/BUILD
+++ b/src/test/cpp/BUILD
@@ -15,8 +15,8 @@ cc_test(
"blaze_util_windows_test.cc",
],
"//conditions:default": [
- "blaze_util_posix_test.cc",
"blaze_util_test.cc",
+ "blaze_util_posix_test.cc",
],
}),
deps = [
diff --git a/src/test/java/com/google/devtools/build/android/BUILD b/src/test/java/com/google/devtools/build/android/BUILD
index 06e5adcf79d521..f64aca068ebd33 100644
--- a/src/test/java/com/google/devtools/build/android/BUILD
+++ b/src/test/java/com/google/devtools/build/android/BUILD
@@ -3,9 +3,9 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test")
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
+ "//src/test/java/com/google/devtools/build/android/idlclass:srcs",
"//src/test/java/com/google/devtools/build/android/desugar:srcs",
"//src/test/java/com/google/devtools/build/android/dexer:srcs",
- "//src/test/java/com/google/devtools/build/android/idlclass:srcs",
"//src/test/java/com/google/devtools/build/android/junctions:srcs",
"//src/test/java/com/google/devtools/build/android/r8:srcs",
"//src/test/java/com/google/devtools/build/android/resources:srcs",
diff --git a/src/test/java/com/google/devtools/build/android/r8/BUILD b/src/test/java/com/google/devtools/build/android/r8/BUILD
index 940b22bcb732ac..f816bdd4078934 100644
--- a/src/test/java/com/google/devtools/build/android/r8/BUILD
+++ b/src/test/java/com/google/devtools/build/android/r8/BUILD
@@ -29,8 +29,8 @@ java_library(
"//conditions:default": ["NoAndroidSdkStubTest.java"],
}),
deps = [
- "//src/main/java/com/google/devtools/common/options:options_internal",
"//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
+ "//src/main/java/com/google/devtools/common/options:options_internal",
"//src/tools/android/java/com/google/devtools/build/android/r8",
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 03e2386e362d93..fd7a97ab2f3e82 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -18,9 +18,9 @@ filegroup(
"//src/test/java/com/google/devtools/build/lib/bazel:srcs",
"//src/test/java/com/google/devtools/build/lib/bazel/google:srcs",
"//src/test/java/com/google/devtools/build/lib/blackbox:srcs",
- "//src/test/java/com/google/devtools/build/lib/bugreport:srcs",
"//src/test/java/com/google/devtools/build/lib/buildeventservice:srcs",
"//src/test/java/com/google/devtools/build/lib/buildeventstream:srcs",
+ "//src/test/java/com/google/devtools/build/lib/bugreport:srcs",
"//src/test/java/com/google/devtools/build/lib/buildtool:srcs",
"//src/test/java/com/google/devtools/build/lib/cmdline:srcs",
"//src/test/java/com/google/devtools/build/lib/collect:srcs",
@@ -31,14 +31,14 @@ filegroup(
"//src/test/java/com/google/devtools/build/lib/generatedprojecttest:srcs",
"//src/test/java/com/google/devtools/build/lib/generatedprojecttest/util:srcs",
"//src/test/java/com/google/devtools/build/lib/graph:srcs",
- "//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
"//src/test/java/com/google/devtools/build/lib/io:srcs",
+ "//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
"//src/test/java/com/google/devtools/build/lib/metrics:srcs",
"//src/test/java/com/google/devtools/build/lib/outputfilter:srcs",
"//src/test/java/com/google/devtools/build/lib/packages:srcs",
+ "//src/test/java/com/google/devtools/build/lib/pkgcache:srcs",
"//src/test/java/com/google/devtools/build/lib/packages/metrics:srcs",
"//src/test/java/com/google/devtools/build/lib/packages/semantics:srcs",
- "//src/test/java/com/google/devtools/build/lib/pkgcache:srcs",
"//src/test/java/com/google/devtools/build/lib/platform:srcs",
"//src/test/java/com/google/devtools/build/lib/platform/darwin:srcs",
"//src/test/java/com/google/devtools/build/lib/profiler:srcs",
@@ -50,20 +50,20 @@ filegroup(
"//src/test/java/com/google/devtools/build/lib/rules:srcs",
"//src/test/java/com/google/devtools/build/lib/sandbox:srcs",
"//src/test/java/com/google/devtools/build/lib/server:srcs",
- "//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
+ "//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
"//src/test/java/com/google/devtools/build/lib/standalone:srcs",
"//src/test/java/com/google/devtools/build/lib/starlark:srcs",
"//src/test/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
"//src/test/java/com/google/devtools/build/lib/supplier:srcs",
- "//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
- "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
+ "//src/test/java/com/google/devtools/build/lib/versioning:srcs",
+ "//src/test/java/com/google/devtools/build/lib/vfs:srcs",
"//src/test/java/com/google/devtools/build/lib/unix:srcs",
"//src/test/java/com/google/devtools/build/lib/unsafe:srcs",
"//src/test/java/com/google/devtools/build/lib/util:srcs",
- "//src/test/java/com/google/devtools/build/lib/versioning:srcs",
- "//src/test/java/com/google/devtools/build/lib/vfs:srcs",
+ "//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
+ "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
"//src/test/java/com/google/devtools/build/lib/view/cpp:srcs",
"//src/test/java/com/google/devtools/build/lib/view/java:srcs",
"//src/test/java/com/google/devtools/build/lib/view/util:srcs",
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
index 82d43dfed806e0..53c981c59f159c 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
@@ -39,10 +39,10 @@ filegroup(
name = "srcs",
testonly = 0,
srcs = glob(["**"]) + [
- "//src/test/java/com/google/devtools/build/lib/blackbox/bazel:srcs",
"//src/test/java/com/google/devtools/build/lib/blackbox/framework:srcs",
- "//src/test/java/com/google/devtools/build/lib/blackbox/junit:srcs",
+ "//src/test/java/com/google/devtools/build/lib/blackbox/bazel:srcs",
"//src/test/java/com/google/devtools/build/lib/blackbox/tests:srcs",
+ "//src/test/java/com/google/devtools/build/lib/blackbox/junit:srcs",
],
visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
index 6d82275ccf2e18..57ab156bc4fa25 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD
@@ -48,8 +48,8 @@ java_test(
deps = common_deps + [
"//src/main/java/com/google/devtools/build/lib/bazel/repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
@@ -66,8 +66,8 @@ java_test(
deps = common_deps + [
"//src/main/java/com/google/devtools/build/lib/bazel/repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
@@ -82,8 +82,8 @@ java_test(
deps = common_deps + [
"//src/main/java/com/google/devtools/build/lib/bazel/repository",
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/vfs/util",
+ "//src/test/java/com/google/devtools/build/lib/events:testutil",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/remote/BUILD b/src/test/java/com/google/devtools/build/lib/remote/BUILD
index 2355d123f7208d..8cca20cd451260 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/BUILD
@@ -10,8 +10,8 @@ filegroup(
testonly = 0,
srcs = glob(["**"]) + [
"//src/test/java/com/google/devtools/build/lib/remote/downloader:srcs",
- "//src/test/java/com/google/devtools/build/lib/remote/grpc:srcs",
"//src/test/java/com/google/devtools/build/lib/remote/http:srcs",
+ "//src/test/java/com/google/devtools/build/lib/remote/grpc:srcs",
"//src/test/java/com/google/devtools/build/lib/remote/logging:srcs",
"//src/test/java/com/google/devtools/build/lib/remote/merkletree:srcs",
"//src/test/java/com/google/devtools/build/lib/remote/options:srcs",
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 d2905e23d8040c..6a19598a6fc7f7 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -98,21 +98,29 @@ java_test(
"//conditions:default": [],
}) + [
":testutil",
+ "//src/main/java/com/google/devtools/build/lib/analysis:config/toolchain_type_requirement",
+ "//src/main/java/com/google/devtools/build/lib/analysis:file_provider",
+ "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:common",
+ "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:resolution_impl",
+ "//src/main/java/com/google/devtools/build/lib/bazel/repository",
+ "//src/main/java/com/google/devtools/build/lib/bazel/repository:repository_options",
"//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",
"//src/main/java/com/google/devtools/build/lib:runtime/memory_pressure",
+ "//src/main/java/net/starlark/java/syntax",
+ "//src/main/java/net/starlark/java/eval",
"//src/main/java/com/google/devtools/build/lib/actions",
- "//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
"//src/main/java/com/google/devtools/build/lib/actions:action_lookup_data",
+ "//src/main/java/com/google/devtools/build/lib/actions:package_roots",
+ "//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
"//src/main/java/com/google/devtools/build/lib/actions:action_lookup_key",
- "//src/main/java/com/google/devtools/build/lib/actions:artifact_owner",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
- "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
+ "//src/main/java/com/google/devtools/build/lib/actions:artifact_owner",
"//src/main/java/com/google/devtools/build/lib/actions:fileset_output_symlink",
- "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
+ "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/actions:middleman_type",
- "//src/main/java/com/google/devtools/build/lib/actions:package_roots",
+ "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
"//src/main/java/com/google/devtools/build/lib/actions:resource_manager",
"//src/main/java/com/google/devtools/build/lib/actions:thread_state_receiver",
"//src/main/java/com/google/devtools/build/lib/analysis:actions/custom_command_line",
@@ -127,7 +135,6 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment",
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_class_set",
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_options",
- "//src/main/java/com/google/devtools/build/lib/analysis:config/toolchain_type_requirement",
"//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",
@@ -139,7 +146,6 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/analysis:configured_target_value",
"//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:file_provider",
"//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:server_directories",
@@ -152,10 +158,6 @@ java_test(
"//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/bzlmod:common",
- "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:resolution_impl",
- "//src/main/java/com/google/devtools/build/lib/bazel/repository",
- "//src/main/java/com/google/devtools/build/lib/bazel/repository:repository_options",
"//src/main/java/com/google/devtools/build/lib/bazel/rules",
"//src/main/java/com/google/devtools/build/lib/bugreport",
"//src/main/java/com/google/devtools/build/lib/clock",
@@ -167,10 +169,6 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/exec:bin_tools",
"//src/main/java/com/google/devtools/build/lib/exec:execution_options",
"//src/main/java/com/google/devtools/build/lib/exec:single_build_file_cache",
- "//src/main/java/com/google/devtools/build/lib/io:file_symlink_cycle_exception",
- "//src/main/java/com/google/devtools/build/lib/io:file_symlink_cycle_uniqueness_function",
- "//src/main/java/com/google/devtools/build/lib/io:file_symlink_infinite_expansion_exception",
- "//src/main/java/com/google/devtools/build/lib/io:file_symlink_infinite_expansion_uniqueness_function",
"//src/main/java/com/google/devtools/build/lib/io:inconsistent_filesystem_exception",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/packages:globber",
@@ -190,10 +188,11 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/skyframe:artifact_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:artifact_nested_set_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:aspect_key_creator",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:bzl_compile",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_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",
"//src/main/java/com/google/devtools/build/lib/skyframe:builder",
- "//src/main/java/com/google/devtools/build/lib/skyframe:bzl_compile",
"//src/main/java/com/google/devtools/build/lib/skyframe:bzl_load_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:cached_bzl_load_value_and_deps",
"//src/main/java/com/google/devtools/build/lib/skyframe:cached_bzl_load_value_and_deps_builder_factory",
@@ -203,13 +202,18 @@ java_test(
"//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:default_syscall_cache",
"//src/main/java/com/google/devtools/build/lib/skyframe:detailed_exceptions",
"//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:default_syscall_cache",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:top_level_status_events",
+ "//src/main/java/com/google/devtools/build/lib/io:file_symlink_cycle_exception",
+ "//src/main/java/com/google/devtools/build/lib/io:file_symlink_cycle_uniqueness_function",
+ "//src/main/java/com/google/devtools/build/lib/io:file_symlink_infinite_expansion_exception",
+ "//src/main/java/com/google/devtools/build/lib/io: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",
@@ -217,7 +221,6 @@ java_test(
"//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:ignored_package_prefixes_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:incompatible_view_exception",
"//src/main/java/com/google/devtools/build/lib/skyframe:incremental_artifact_conflict_finder",
"//src/main/java/com/google/devtools/build/lib/skyframe:local_repository_lookup_value",
@@ -248,9 +251,7 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/skyframe:target_loading_util",
"//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:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_exception",
- "//src/main/java/com/google/devtools/build/lib/skyframe:top_level_status_events",
"//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",
@@ -258,6 +259,7 @@ java_test(
"//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_impl",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_info",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
@@ -266,7 +268,7 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils",
"//src/main/java/com/google/devtools/build/lib/testing/common:directory_listing_helper",
- "//src/main/java/com/google/devtools/build/lib/testing/common:fake-options",
+ "//src/main/java/net/starlark/java/annot",
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
"//src/main/java/com/google/devtools/build/lib/util:crash_failure_details",
@@ -282,9 +284,6 @@ java_test(
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/main/java/com/google/devtools/common/options",
- "//src/main/java/net/starlark/java/annot",
- "//src/main/java/net/starlark/java/eval",
- "//src/main/java/net/starlark/java/syntax",
"//src/main/protobuf:action_cache_java_proto",
"//src/main/protobuf:analysis_v2_java_proto",
"//src/main/protobuf:failure_details_java_proto",
@@ -297,6 +296,7 @@ java_test(
"//src/test/java/com/google/devtools/build/lib/events:testutil",
"//src/test/java/com/google/devtools/build/lib/packages:testutil",
"//src/test/java/com/google/devtools/build/lib/rules/platform:testutil",
+ "//src/main/java/com/google/devtools/build/lib/testing/common:fake-options",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
"//src/test/java/com/google/devtools/build/lib/testutil:SkyframeExecutorTestHelper",
diff --git a/src/test/native/windows/BUILD b/src/test/native/windows/BUILD
index 1740499fb1fa42..0132673496f727 100644
--- a/src/test/native/windows/BUILD
+++ b/src/test/native/windows/BUILD
@@ -31,8 +31,8 @@ cc_test(
}),
deps = select({
"//src/conditions:windows": [
- ":test_deps",
"//src/main/native/windows:lib-file",
+ ":test_deps",
],
"//conditions:default": [],
}),
@@ -47,8 +47,8 @@ cc_test(
}),
deps = select({
"//src/conditions:windows": [
- ":test_deps",
"//src/main/native/windows:lib-file",
+ ":test_deps",
],
"//conditions:default": [],
}),
@@ -65,9 +65,9 @@ cc_test(
deps = select({
"//src/conditions:windows": [
":test_deps",
- "//src/main/cpp/util:filesystem",
"//src/main/native/windows:lib-file",
"//src/main/native/windows:lib-process",
+ "//src/main/cpp/util:filesystem",
"@bazel_tools//tools/cpp/runfiles",
],
"//conditions:default": [],
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 9d176220ba1094..625f006ce675fd 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -37,8 +37,8 @@ filegroup(
name = "embedded_java_tools",
srcs = SOURCES + [
"//src/main/cpp/util:embedded_java_tools",
- "//src/main/protobuf:desugar_deps_filegroup",
"//third_party/zlib:embedded_tools",
+ "//src/main/protobuf:desugar_deps_filegroup",
],
visibility = ["//src:__pkg__"],
)
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index 2c9e37e301cbd7..28f05bf44366da 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -95,16 +95,16 @@ filegroup(
filegroup(
name = "embedded_zipper_sources",
srcs = [
- "BUILD",
+ "zip.cc",
+ "zip.h",
+ "zip_main.cc",
"common.h",
"mapped_file.h",
"platform_utils.cc",
"platform_utils.h",
- "zip.cc",
- "zip.h",
- "zip_main.cc",
"zlib_client.cc",
"zlib_client.h",
+ "BUILD",
] + select({
"//src:windows": [
"mapped_file_windows.cc",
diff --git a/tools/BUILD b/tools/BUILD
index 1fa649bc6d1c9c..4102c0ae8d6e78 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -3,37 +3,37 @@ package(default_visibility = ["//visibility:public"])
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
- "//tools/allowlists:srcs",
"//tools/android:srcs",
"//tools/aquery_differ:srcs",
"//tools/bash:srcs",
+ "//tools/buildstamp:srcs",
"//tools/build_defs:srcs",
"//tools/build_rules:srcs",
- "//tools/buildstamp:srcs",
"//tools/compliance:srcs",
"//tools/coverage:srcs",
- "//tools/cpp:srcs",
"//tools/ctexplain:srcs",
- "//tools/def_parser:srcs",
"//tools/distributions:srcs",
- "//tools/genrule:srcs",
- "//tools/j2objc:srcs",
"//tools/java:srcs",
"//tools/jdk:srcs",
"//tools/launcher:srcs",
- "//tools/mini_tar:srcs",
+ "//tools/def_parser:srcs",
+ "//tools/platforms:srcs",
+ "//tools/genrule:srcs",
+ "//tools/cpp:srcs",
+ "//tools/j2objc:srcs",
"//tools/objc:srcs",
"//tools/osx:srcs",
- "//tools/platforms:srcs",
"//tools/proto:srcs",
- "//tools/python:srcs",
- "//tools/runfiles:srcs",
- "//tools/sh:srcs",
+ "//tools/windows:srcs",
"//tools/test:srcs",
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:srcs",
"//tools/test/CoverageOutputGenerator/javatests/com/google/devtools/coverageoutputgenerator:srcs",
- "//tools/windows:srcs",
+ "//tools/python:srcs",
+ "//tools/runfiles:srcs",
+ "//tools/sh:srcs",
+ "//tools/allowlists:srcs",
"//tools/zip:srcs",
+ "//tools/mini_tar:srcs",
],
)
@@ -41,7 +41,6 @@ filegroup(
filegroup(
name = "embedded_tools_srcs",
srcs = glob(["**"]) + [
- "//tools/allowlists:srcs",
"//tools/android:embedded_tools",
"//tools/bash:embedded_tools",
"//tools/build_defs:embedded_tools",
@@ -49,24 +48,25 @@ filegroup(
"//tools/buildstamp:srcs",
"//tools/coverage:srcs",
"//tools/cpp:embedded_tools",
- "//tools/def_parser:srcs",
"//tools/genrule:srcs",
- "//tools/j2objc:srcs",
"//tools/java:embedded_tools",
"//tools/java:java_stub_template.txt",
+ "//tools/j2objc:srcs",
"//tools/jdk:package-srcs",
"//tools/jdk:srcs",
"//tools/launcher:srcs",
- "//tools/objc:srcs",
- "//tools/osx:srcs",
+ "//tools/def_parser:srcs",
+ "//tools/windows:srcs",
"//tools/platforms:srcs",
"//tools/proto:srcs",
+ "//tools/objc:srcs",
"//tools/python:embedded_tools",
"//tools/runfiles:embedded_tools",
- "//tools/sh:embedded_tools",
"//tools/test:embedded_tools",
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:embedded_tools",
- "//tools/windows:srcs",
+ "//tools/osx:srcs",
+ "//tools/sh:embedded_tools",
+ "//tools/allowlists:srcs",
"//tools/zip:srcs",
],
)
diff --git a/tools/build_defs/BUILD b/tools/build_defs/BUILD
index c176d2df3569f3..754093e8f53a66 100644
--- a/tools/build_defs/BUILD
+++ b/tools/build_defs/BUILD
@@ -2,13 +2,13 @@ filegroup(
name = "srcs",
srcs = glob(["**"]) + [
"//tools/build_defs/cc:srcs",
- "//tools/build_defs/cc/tests:cc_import_tests_files",
"//tools/build_defs/cc/whitelists/parse_headers_and_layering_check:srcs",
"//tools/build_defs/cc/whitelists/starlark_hdrs_check:srcs",
"//tools/build_defs/hash:srcs",
"//tools/build_defs/inspect:srcs",
"//tools/build_defs/pkg:srcs",
"//tools/build_defs/repo:srcs",
+ "//tools/build_defs/cc/tests:cc_import_tests_files",
],
visibility = ["//tools:__pkg__"],
)
diff --git a/tools/test/BUILD b/tools/test/BUILD
index 6f39dd99b2afe2..2d9b35b1a7d91e 100644
--- a/tools/test/BUILD
+++ b/tools/test/BUILD
@@ -111,11 +111,11 @@ filegroup(
name = "embedded_tools",
srcs = [
"BUILD.tools",
- "collect_cc_coverage.sh",
+ "test-setup.sh",
+ "generate-xml.sh",
"collect_coverage.sh",
+ "collect_cc_coverage.sh",
"extensions.bzl",
- "generate-xml.sh",
- "test-setup.sh",
] + select({
"@bazel_tools//src/conditions:windows": [
"tw",