diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index c915a93ce93884..1f00b019f2e3e3 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -6,8 +6,8 @@ filegroup( name = "srcs", srcs = glob(["**"]) + [ "//scripts/packages/debian:srcs", - "//scripts/packages/fedora:srcs", "//scripts/packages/dmg:srcs", + "//scripts/packages/fedora:srcs", ], visibility = [ "//scripts:__pkg__", @@ -25,14 +25,14 @@ filegroup( "//src/conditions:freebsd": [], "//src/conditions:openbsd": [], "//src/conditions:darwin": [ + ":generate-package-info", ":with-jdk/install.sh", ":without-jdk/install.sh", - ":generate-package-info", ], "//conditions:default": [ + ":generate-package-info", ":with-jdk/install.sh", ":without-jdk/install.sh", - ":generate-package-info", "//:bazel-distfile", "//scripts/packages/debian:bazel-debian", "//scripts/packages/debian:bazel-debian-src", diff --git a/src/BUILD b/src/BUILD index 2dd60920b58b63..7bd525cf75d786 100644 --- a/src/BUILD +++ b/src/BUILD @@ -90,8 +90,14 @@ JAVA_TOOLS = [ srcs = JAVA_TOOLS + [ "BUILD.tools", "MODULE.tools", - "//tools:embedded_tools_srcs", + "//src/conditions:embedded_tools", + "//src/main/cpp/util:embedded_tools", + "//src/main/native:embedded_tools", + "//src/main/protobuf:srcs", + "//src/tools/android/java/com/google/devtools/build/android:embedded_tools", + "//src/tools/launcher:srcs", "//third_party:gpl-srcs", + "//third_party/def_parser:srcs", "//third_party/grpc:embedded_tools_srcs", "//third_party/grpc/bazel:embedded_tools_srcs", "//third_party/ijar:embedded_zipper_sources", @@ -99,14 +105,8 @@ JAVA_TOOLS = [ "//third_party/java/j2objc:embedded_tools_srcs", "//third_party/py/abseil:srcs", "//third_party/py/six:srcs", - "//src/conditions:embedded_tools", - "//src/tools/android/java/com/google/devtools/build/android:embedded_tools", - "//src/tools/launcher:srcs", - "//src/main/cpp/util:embedded_tools", - "//src/main/native:embedded_tools", - "//src/main/protobuf:srcs", - "//third_party/def_parser:srcs", "//third_party/zlib:embedded_tools", + "//tools:embedded_tools_srcs", ] + select({ "//src/conditions:darwin": [ "//tools/osx:xcode_locator.m", @@ -114,9 +114,9 @@ JAVA_TOOLS = [ "//conditions:default": [], }) + select({ "//src/conditions:windows": [ - "//src/tools/launcher:launcher", + "//src/tools/launcher", "//src/tools/launcher:launcher_maker", - "//third_party/def_parser:def_parser", + "//third_party/def_parser", ], "//conditions:default": [], }) + @@ -339,7 +339,6 @@ filegroup( "//src/java_tools/junitrunner/javatests/com/google/testing/coverage:srcs", "//src/java_tools/singlejar:srcs", "//src/main/cpp:srcs", - "//src/main/res:srcs", "//src/main/java/com/google/devtools/build/docgen:srcs", "//src/main/java/com/google/devtools/build/lib:srcs", "//src/main/java/com/google/devtools/build/lib/includescanning:srcs", @@ -349,16 +348,15 @@ filegroup( "//src/main/java/com/google/devtools/build/skyframe:srcs", "//src/main/java/com/google/devtools/common/options:srcs", "//src/main/java/net/starlark/java/cmd:srcs", - "//src/main/java/net/starlark/java/spelling:srcs", "//src/main/java/net/starlark/java/lib/json:srcs", + "//src/main/java/net/starlark/java/spelling:srcs", "//src/main/native:srcs", "//src/main/protobuf:srcs", + "//src/main/res:srcs", "//src/main/starlark/builtins_bzl:srcs", "//src/main/tools:srcs", "//src/test/cpp:srcs", "//src/test/gen:srcs", - "//src/test/res:srcs", - "//src/test/native/windows:srcs", "//src/test/java/com/google/devtools/build/android:srcs", "//src/test/java/com/google/devtools/build/docgen:srcs", "//src/test/java/com/google/devtools/build/lib:srcs", @@ -368,18 +366,20 @@ filegroup( "//src/test/java/com/google/devtools/common/options:srcs", "//src/test/java/net/starlark/java/eval:srcs", "//src/test/java/net/starlark/java/spelling:srcs", + "//src/test/native/windows:srcs", "//src/test/py/bazel:srcs", + "//src/test/res:srcs", "//src/test/shell:srcs", "//src/test/testdata/test_tls_certificate", "//src/test/tools:srcs", "//src/tools/android:srcs", "//src/tools/android/java/com/google/devtools/build/android:srcs", "//src/tools/execlog:srcs", - "//src/tools/workspacelog:srcs", "//src/tools/launcher:srcs", - "//src/tools/starlark/java/com/google/devtools/starlark/common:srcs", - "//src/tools/singlejar:srcs", "//src/tools/remote:srcs", + "//src/tools/singlejar:srcs", + "//src/tools/starlark/java/com/google/devtools/starlark/common:srcs", + "//src/tools/workspacelog:srcs", "//tools/osx:srcs", ], visibility = ["//:__pkg__"], @@ -564,13 +564,13 @@ filegroup( "@bazel_skylib//:WORKSPACE", "@com_google_protobuf//:WORKSPACE", "@remote_coverage_tools//:WORKSPACE", - "@remote_java_tools_darwin_x86_64_for_testing//:WORKSPACE", "@remote_java_tools_darwin_arm64_for_testing//:WORKSPACE", + "@remote_java_tools_darwin_x86_64_for_testing//:WORKSPACE", "@remote_java_tools_for_testing//:WORKSPACE", "@remote_java_tools_linux_for_testing//:WORKSPACE", "@remote_java_tools_test//:WORKSPACE", - "@remote_java_tools_test_darwin_x86_64//:WORKSPACE", "@remote_java_tools_test_darwin_arm64//:WORKSPACE", + "@remote_java_tools_test_darwin_x86_64//:WORKSPACE", "@remote_java_tools_test_linux//:WORKSPACE", "@remote_java_tools_test_windows//:WORKSPACE", "@remote_java_tools_windows_for_testing//:WORKSPACE", diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD index ffe7caf6bb5b03..3a5c0ba1964dfa 100644 --- a/src/main/cpp/BUILD +++ b/src/main/cpp/BUILD @@ -92,9 +92,9 @@ cc_binary( srcs = [ "blaze.cc", "blaze.h", + "main.cc", "server_process_info.cc", "server_process_info.h", - "main.cc", ] + select({ "//src/conditions:windows": ["resources.o"], "//conditions:default": [], diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index d580386e833cce..f4fb4c585d8c64 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -38,24 +38,24 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/authandtls:srcs", "//src/main/java/com/google/devtools/build/lib/bazel:srcs", "//src/main/java/com/google/devtools/build/lib/bugreport:srcs", - "//src/main/java/com/google/devtools/build/lib/buildeventservice/client:srcs", "//src/main/java/com/google/devtools/build/lib/buildeventservice:srcs", + "//src/main/java/com/google/devtools/build/lib/buildeventservice/client:srcs", + "//src/main/java/com/google/devtools/build/lib/buildeventstream:srcs", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:srcs", "//src/main/java/com/google/devtools/build/lib/buildeventstream/transports:srcs", - "//src/main/java/com/google/devtools/build/lib/buildeventstream:srcs", "//src/main/java/com/google/devtools/build/lib/causes:srcs", "//src/main/java/com/google/devtools/build/lib/clock:srcs", "//src/main/java/com/google/devtools/build/lib/cmdline:srcs", + "//src/main/java/com/google/devtools/build/lib/collect:srcs", "//src/main/java/com/google/devtools/build/lib/collect/compacthashmap:srcs", "//src/main/java/com/google/devtools/build/lib/collect/compacthashset:srcs", "//src/main/java/com/google/devtools/build/lib/collect/nestedset:srcs", - "//src/main/java/com/google/devtools/build/lib/collect:srcs", "//src/main/java/com/google/devtools/build/lib/concurrent:srcs", "//src/main/java/com/google/devtools/build/lib/dynamic:srcs", "//src/main/java/com/google/devtools/build/lib/events:srcs", "//src/main/java/com/google/devtools/build/lib/exec:srcs", - "//src/main/java/com/google/devtools/build/lib/io:srcs", "//src/main/java/com/google/devtools/build/lib/graph:srcs", + "//src/main/java/com/google/devtools/build/lib/io:srcs", "//src/main/java/com/google/devtools/build/lib/jni:srcs", "//src/main/java/com/google/devtools/build/lib/metrics:srcs", "//src/main/java/com/google/devtools/build/lib/network:srcs", @@ -64,15 +64,15 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/packages/semantics:srcs", "//src/main/java/com/google/devtools/build/lib/pkgcache:srcs", "//src/main/java/com/google/devtools/build/lib/platform:srcs", + "//src/main/java/com/google/devtools/build/lib/profiler:srcs", "//src/main/java/com/google/devtools/build/lib/profiler/callcounts:srcs", "//src/main/java/com/google/devtools/build/lib/profiler/memory:srcs", - "//src/main/java/com/google/devtools/build/lib/profiler:srcs", + "//src/main/java/com/google/devtools/build/lib/query2:srcs", "//src/main/java/com/google/devtools/build/lib/query2/common:srcs", "//src/main/java/com/google/devtools/build/lib/query2/compat:srcs", "//src/main/java/com/google/devtools/build/lib/query2/engine:srcs", "//src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers:srcs", "//src/main/java/com/google/devtools/build/lib/query2/query/output:srcs", - "//src/main/java/com/google/devtools/build/lib/query2:srcs", "//src/main/java/com/google/devtools/build/lib/remote:srcs", "//src/main/java/com/google/devtools/build/lib/repository:srcs", "//src/main/java/com/google/devtools/build/lib/rules:srcs", @@ -83,16 +83,11 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/server:srcs", "//src/main/java/com/google/devtools/build/lib/shell:srcs", "//src/main/java/com/google/devtools/build/lib/skyframe:srcs", + "//src/main/java/com/google/devtools/build/lib/standalone:srcs", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi:srcs", "//src/main/java/com/google/devtools/build/lib/starlarkdebug/module:srcs", "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:srcs", "//src/main/java/com/google/devtools/build/lib/starlarkdebug/server:srcs", - "//src/main/java/net/starlark/java/annot/processor:srcs", - "//src/main/java/net/starlark/java/annot:srcs", - "//src/main/java/net/starlark/java/eval:srcs", - "//src/main/java/net/starlark/java/syntax:srcs", - "//src/main/java/net/starlark/java:srcs", - "//src/main/java/com/google/devtools/build/lib/standalone:srcs", "//src/main/java/com/google/devtools/build/lib/supplier:srcs", "//src/main/java/com/google/devtools/build/lib/testing/common:srcs", "//src/main/java/com/google/devtools/build/lib/testing/vfs:srcs", @@ -100,12 +95,17 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/unsafe:srcs", "//src/main/java/com/google/devtools/build/lib/util:srcs", "//src/main/java/com/google/devtools/build/lib/versioning:srcs", - "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs:srcs", "//src/main/java/com/google/devtools/build/lib/vfs:srcs", + "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs:srcs", "//src/main/java/com/google/devtools/build/lib/windows:srcs", "//src/main/java/com/google/devtools/build/lib/worker:srcs", "//src/main/java/com/google/devtools/build/skyframe:srcs", "//src/main/java/com/google/devtools/common/options:srcs", + "//src/main/java/net/starlark/java:srcs", + "//src/main/java/net/starlark/java/annot:srcs", + "//src/main/java/net/starlark/java/annot/processor:srcs", + "//src/main/java/net/starlark/java/eval:srcs", + "//src/main/java/net/starlark/java/syntax:srcs", ], visibility = [ "//src:__pkg__", @@ -479,10 +479,10 @@ filegroup( name = "docs_embedded_in_sources", srcs = glob(["**/*.java"]) + [ "//src/main/java/com/google/devtools/build/lib/analysis:srcs", + "//src/main/java/com/google/devtools/build/lib/bazel/rules:srcs", "//src/main/java/com/google/devtools/build/lib/exec:srcs", "//src/main/java/com/google/devtools/build/lib/repository:srcs", "//src/main/java/com/google/devtools/build/lib/rules:srcs", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:srcs", ], ) diff --git a/src/main/native/BUILD b/src/main/native/BUILD index e181e16087a829..2601d3298cfb30 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/fsevents.cc", "darwin/file_jni.cc", + "darwin/fsevents.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/starlark/builtins_bzl/common/cc/cc_test.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl index 768bc19f91144e..5ac09bc8bb7fb8 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl @@ -21,9 +21,12 @@ load(":common/cc/cc_helper.bzl", "cc_helper") load(":common/cc/semantics.bzl", "semantics") cc_internal = _builtins.internal.cc_internal +config_common = _builtins.toplevel.config_common platform_common = _builtins.toplevel.platform_common testing = _builtins.toplevel.testing +_CC_TEST_TOOLCHAIN_TYPE = "@" + semantics.get_repo() + "//tools/cpp:test_runner_toolchain_type" + def _cc_test_impl(ctx): binary_info, providers = cc_binary_impl(ctx, []) test_env = {} @@ -55,12 +58,13 @@ def _cc_test_impl(ctx): return providers def _impl(ctx): - if semantics.should_use_legacy_cc_test(ctx): + cc_test_toolchain = ctx.exec_groups["test"].toolchains[_CC_TEST_TOOLCHAIN_TYPE] + if cc_test_toolchain: + cc_test_info = cc_test_toolchain.cc_test_info + else: # This is the "legacy" cc_test flow return _cc_test_impl(ctx) - cc_test_info = ctx.attr._test_toolchain[cc_internal.CcTestRunnerInfo] - binary_info, providers = cc_binary_impl(ctx, cc_test_info.linkopts) processed_environment = cc_helper.get_expanded_env(ctx, {}) @@ -113,7 +117,6 @@ def make_cc_test(with_linkstatic = False, with_aspects = False): linkstatic = attr.bool(default = False), ) _cc_test_attrs.update(semantics.get_test_malloc_attr()) - _cc_test_attrs.update(semantics.get_test_toolchain_attr()) _cc_test_attrs.update(semantics.get_coverage_attrs()) _cc_test_attrs.update( @@ -130,8 +133,11 @@ def make_cc_test(with_linkstatic = False, with_aspects = False): fragments = ["google_cpp", "cpp", "coverage"], exec_groups = { "cpp_link": exec_group(toolchains = cc_helper.use_cpp_toolchain()), + # testing.ExecutionInfo defaults to an exec_group of "test". + "test": exec_group(toolchains = [config_common.toolchain_type(_CC_TEST_TOOLCHAIN_TYPE, mandatory = False)]), }, - toolchains = cc_helper.use_cpp_toolchain() + + toolchains = [] + + cc_helper.use_cpp_toolchain() + semantics.get_runtimes_toolchain(), incompatible_use_toolchain_transition = True, test = True, diff --git a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl index 1dac0498ac99a5..0abe1730da032c 100644 --- a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl @@ -76,9 +76,6 @@ def _get_grep_includes(): def _get_runtimes_toolchain(): return [] -def _get_test_toolchain_attr(): - return {} - def _get_test_malloc_attr(): return {} @@ -140,9 +137,6 @@ def _get_cc_runtimes(ctx, is_library): return runtimes -def _should_use_legacy_cc_test(_): - return True - def _get_implementation_deps_allowed_attr(): return {} @@ -203,9 +197,7 @@ semantics = struct( get_linkstatic_default = _get_linkstatic_default, get_runtimes_toolchain = _get_runtimes_toolchain, get_test_malloc_attr = _get_test_malloc_attr, - get_test_toolchain_attr = _get_test_toolchain_attr, get_cc_runtimes = _get_cc_runtimes, - should_use_legacy_cc_test = _should_use_legacy_cc_test, get_coverage_attrs = _get_coverage_attrs, get_coverage_env = _get_coverage_env, get_proto_aspects = _get_proto_aspects, diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD index 7e2d2a1461c36e..058a6c5e9f47ae 100644 --- a/src/main/tools/BUILD +++ b/src/main/tools/BUILD @@ -50,8 +50,8 @@ cc_binary( deps = select({ "//src/conditions:windows": [], "//conditions:default": [ - ":process-tools", ":logging", + ":process-tools", ], }), ) diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD index 755c97eb496c8a..129ea120fe8f76 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_test.cc", "blaze_util_posix_test.cc", + "blaze_util_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 f64aca068ebd33..06e5adcf79d521 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 f816bdd4078934..940b22bcb732ac 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/test/java/com/google/devtools/build/lib/testutil:TestSuite", "//src/main/java/com/google/devtools/common/options:options_internal", + "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite", "//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 fd7a97ab2f3e82..03e2386e362d93 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/io: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/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/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/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/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/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 53c981c59f159c..82d43dfed806e0 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/framework: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/framework:srcs", "//src/test/java/com/google/devtools/build/lib/blackbox/junit:srcs", + "//src/test/java/com/google/devtools/build/lib/blackbox/tests: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 57ab156bc4fa25..6d82275ccf2e18 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/vfs/util", "//src/test/java/com/google/devtools/build/lib/events:testutil", + "//src/test/java/com/google/devtools/build/lib/vfs/util", ], ) @@ -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/vfs/util", "//src/test/java/com/google/devtools/build/lib/events:testutil", + "//src/test/java/com/google/devtools/build/lib/vfs/util", ], ) @@ -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/vfs/util", "//src/test/java/com/google/devtools/build/lib/events:testutil", + "//src/test/java/com/google/devtools/build/lib/vfs/util", ], ) 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 8cca20cd451260..2355d123f7208d 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/http: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/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 6a19598a6fc7f7..d2905e23d8040c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD @@ -98,29 +98,21 @@ 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_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_data", "//src/main/java/com/google/devtools/build/lib/actions:action_lookup_key", - "//src/main/java/com/google/devtools/build/lib/actions:artifacts", "//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:artifacts", "//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:fileset_output_symlink", "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity", + "//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: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", @@ -135,6 +127,7 @@ 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", @@ -146,6 +139,7 @@ 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", @@ -158,6 +152,10 @@ 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", @@ -169,6 +167,10 @@ 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", @@ -188,11 +190,10 @@ 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", @@ -202,18 +203,13 @@ 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", @@ -221,6 +217,7 @@ 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", @@ -251,7 +248,9 @@ 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", @@ -259,7 +258,6 @@ 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", @@ -268,7 +266,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/net/starlark/java/annot", + "//src/main/java/com/google/devtools/build/lib/testing/common:fake-options", "//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", @@ -284,6 +282,9 @@ 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", @@ -296,7 +297,6 @@ 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 0132673496f727..1740499fb1fa42 100644 --- a/src/test/native/windows/BUILD +++ b/src/test/native/windows/BUILD @@ -31,8 +31,8 @@ cc_test( }), deps = select({ "//src/conditions:windows": [ - "//src/main/native/windows:lib-file", ":test_deps", + "//src/main/native/windows:lib-file", ], "//conditions:default": [], }), @@ -47,8 +47,8 @@ cc_test( }), deps = select({ "//src/conditions:windows": [ - "//src/main/native/windows:lib-file", ":test_deps", + "//src/main/native/windows:lib-file", ], "//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 625f006ce675fd..9d176220ba1094 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", - "//third_party/zlib:embedded_tools", "//src/main/protobuf:desugar_deps_filegroup", + "//third_party/zlib:embedded_tools", ], visibility = ["//src:__pkg__"], ) diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD index 28f05bf44366da..2c9e37e301cbd7 100644 --- a/third_party/ijar/BUILD +++ b/third_party/ijar/BUILD @@ -95,16 +95,16 @@ filegroup( filegroup( name = "embedded_zipper_sources", srcs = [ - "zip.cc", - "zip.h", - "zip_main.cc", + "BUILD", "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 4102c0ae8d6e78..1fa649bc6d1c9c 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/def_parser:srcs", - "//tools/platforms:srcs", - "//tools/genrule:srcs", - "//tools/cpp:srcs", - "//tools/j2objc:srcs", + "//tools/mini_tar:srcs", "//tools/objc:srcs", "//tools/osx:srcs", + "//tools/platforms:srcs", "//tools/proto: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/python:srcs", "//tools/runfiles:srcs", "//tools/sh:srcs", - "//tools/allowlists: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/zip:srcs", - "//tools/mini_tar:srcs", ], ) @@ -41,6 +41,7 @@ filegroup( filegroup( name = "embedded_tools_srcs", srcs = glob(["**"]) + [ + "//tools/allowlists:srcs", "//tools/android:embedded_tools", "//tools/bash:embedded_tools", "//tools/build_defs:embedded_tools", @@ -48,25 +49,24 @@ 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/def_parser:srcs", - "//tools/windows:srcs", + "//tools/objc:srcs", + "//tools/osx: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/osx:srcs", - "//tools/sh:embedded_tools", - "//tools/allowlists:srcs", + "//tools/windows:srcs", "//tools/zip:srcs", ], ) diff --git a/tools/build_defs/BUILD b/tools/build_defs/BUILD index 754093e8f53a66..c176d2df3569f3 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 2d9b35b1a7d91e..6f39dd99b2afe2 100644 --- a/tools/test/BUILD +++ b/tools/test/BUILD @@ -111,11 +111,11 @@ filegroup( name = "embedded_tools", srcs = [ "BUILD.tools", - "test-setup.sh", - "generate-xml.sh", - "collect_coverage.sh", "collect_cc_coverage.sh", + "collect_coverage.sh", "extensions.bzl", + "generate-xml.sh", + "test-setup.sh", ] + select({ "@bazel_tools//src/conditions:windows": [ "tw",