diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
10 files changed, 347 insertions, 341 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 5db8132fa6..d29bee0988 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -11,11 +11,14 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/actions:srcs", "//src/main/java/com/google/devtools/build/lib/analysis/platform:srcs", "//src/main/java/com/google/devtools/build/lib/analysis/whitelisting:srcs", + "//src/main/java/com/google/devtools/build/lib/authandtls:srcs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache:srcs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader: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/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/cmdline:srcs", "//src/main/java/com/google/devtools/build/lib/exec/apple:srcs", @@ -65,10 +68,10 @@ java_library( "//conditions:default": ["//src/main/native:libunix.so"], }), deps = [ - ":concurrent", - ":os_util", - ":preconditions", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/profiler", "//src/main/java/com/google/devtools/build/lib/shell", "//third_party:guava", @@ -82,12 +85,12 @@ java_library( ]), visibility = ["//visibility:public"], deps = [ - ":base-util", - ":clock", - ":concurrent", - ":os_util", - ":preconditions", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:base-util", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/windows/jni", "//src/main/java/com/google/devtools/common/options", @@ -101,7 +104,7 @@ java_library( name = "concurrent", srcs = glob(["concurrent/*.java"]), deps = [ - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:preconditions", "//third_party:guava", "//third_party:jsr305", ], @@ -115,8 +118,8 @@ java_library( "collect/nestedset/*.java", ]), deps = [ - ":concurrent", - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:preconditions", "//third_party:guava", "//third_party:jsr305", ], @@ -130,11 +133,11 @@ java_library( ]), visibility = ["//visibility:public"], deps = [ - ":base-util", - ":clock", - ":concurrent", - ":os_util", - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:base-util", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", "//src/main/java/com/google/devtools/build/lib/profiler", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", @@ -148,12 +151,12 @@ java_library( name = "inmemoryfs", srcs = glob(["vfs/inmemoryfs/*.java"]), deps = [ - ":clock", - ":concurrent", - ":os_util", - ":preconditions", - ":unix", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", + "//src/main/java/com/google/devtools/build/lib:unix", + "//src/main/java/com/google/devtools/build/lib:vfs", "//third_party:guava", "//third_party:jsr305", ], @@ -168,7 +171,7 @@ java_library( "util/JavaClock.java", ], deps = [ - ":concurrent", + "//src/main/java/com/google/devtools/build/lib:concurrent", ], ) @@ -181,8 +184,8 @@ java_library( "util/VarInt.java", ], deps = [ - ":concurrent", - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:preconditions", "//third_party:guava", ], ) @@ -202,9 +205,9 @@ java_library( name = "io", srcs = glob(["util/io/*.java"]), deps = [ - ":clock", - ":concurrent", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/profiler", "//third_party:guava", ], @@ -219,17 +222,17 @@ java_library( java_library( name = "classpath-util", srcs = ["util/Classpath.java"], - deps = [":preconditions"], + deps = ["//src/main/java/com/google/devtools/build/lib:preconditions"], ) java_library( name = "process_util", srcs = ["util/ProcessUtils.java"], deps = [ - ":concurrent", - ":os_util", - ":unix", - ":windows", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:unix", + "//src/main/java/com/google/devtools/build/lib:windows", "//src/main/java/com/google/devtools/build/lib/windows/jni:processes", ], ) @@ -262,22 +265,22 @@ java_library( ], ), exports = [ - ":base-util", - ":clock", - ":collect", - ":exitcode-external", - ":os_util", - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:base-util", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:exitcode-external", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", ], deps = [ - ":base-util", - ":collect", - ":concurrent", - ":exitcode-external", - ":os_util", - ":preconditions", - ":unix", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:base-util", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:exitcode-external", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:preconditions", + "//src/main/java/com/google/devtools/build/lib:unix", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -301,80 +304,12 @@ java_library( name = "events", srcs = glob(["events/*.java"]), deps = [ - ":concurrent", - ":io", - ":preconditions", - ":vfs", - "//third_party:guava", - "//third_party:jsr305", - ], -) - -# External build-event reporting infrastructure -java_library( - name = "buildeventstream", - srcs = glob(["buildeventstream/*.java"]), - deps = [ - ":events", - ":vfs", - "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", - "//src/main/java/com/google/devtools/build/lib/causes", - "//src/main/java/com/google/devtools/build/lib/cmdline", - "//third_party:guava", - "//third_party:jsr305", - "//third_party/protobuf:protobuf_java", - ], -) - -java_library( - name = "buildeventservice", - srcs = glob(["buildeventservice/*.java"]), - visibility = [ - "//visibility:public", - ], - deps = [ - ":vfs", - "//src/main/java/com/google/devtools/build/lib:auth_and_tls_options", - "//src/main/java/com/google/devtools/build/lib:buildeventstream", - "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:concurrent", "//src/main/java/com/google/devtools/build/lib:io", - "//src/main/java/com/google/devtools/build/lib:runtime", - "//src/main/java/com/google/devtools/build/lib:util", - "//src/main/java/com/google/devtools/build/lib/buildeventservice/client", - "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", - "//src/main/java/com/google/devtools/build/lib/buildeventstream/transports", - "//src/main/java/com/google/devtools/common/options", - "//third_party:guava", - "//third_party:jsr305", - "//third_party/grpc:grpc-jar", - "@com_google_protobuf//:protobuf_java", - "@com_google_protobuf//:protobuf_java_util", - "@com_google_protobuf//:well_known_types_any_proto", - "@googleapis//:google_devtools_build_v1_build_events_java_proto", - "@googleapis//:google_devtools_build_v1_build_status_java_proto", - "@googleapis//:google_devtools_build_v1_publish_build_event_java_proto", - ], -) - -java_library( - name = "auth_and_tls_options", - srcs = glob(["authandtls/*.java"]), - visibility = [ - "//src/main/java/com/google/devtools/build/lib/remote:__pkg__", - "//src/test/java/com/google/devtools/build/lib:__pkg__", - "//src/test/java/com/google/devtools/build/lib/buildeventservice:__pkg__", - "//src/test/java/com/google/devtools/build/lib/remote:__pkg__", - "//src/tools/remote_worker/src/main/java/com/google/devtools/build/remote:__pkg__", - ], - deps = [ - "//src/main/java/com/google/devtools/common/options", - "//third_party:apache_httpclient", - "//third_party:apache_httpcore", - "//third_party:auth", + "//src/main/java/com/google/devtools/build/lib:preconditions", + "//src/main/java/com/google/devtools/build/lib:vfs", "//third_party:guava", "//third_party:jsr305", - "//third_party:netty", - "//third_party/grpc:grpc-jar", ], ) @@ -389,10 +324,10 @@ java_library( java_library( name = "foundation", exports = [ - ":concurrent", - ":events", - ":util", - ":vfs", + "//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:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/common/options", ], ) @@ -405,11 +340,11 @@ java_library( name = "skylark-lang", visibility = ["//visibility:public"], exports = [ - ":events", - ":inmemoryfs", - ":skylarkinterface", - ":syntax", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:inmemoryfs", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:syntax", + "//src/main/java/com/google/devtools/build/lib:vfs", ], ) @@ -430,12 +365,12 @@ java_library( "syntax/**/*.java", ]), deps = [ - ":collect", - ":concurrent", - ":events", - ":skylarkinterface", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/profiler", "//src/main/java/com/google/devtools/common/options", @@ -475,19 +410,19 @@ java_library( "pkgcache/*.java", ]), exports = [ - ":syntax", + "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/cmdline", ], deps = [ - ":buildeventstream", - ":collect", - ":concurrent", - ":events", - ":skylarkinterface", - ":syntax", - ":transitive-info-provider", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:syntax", + "//src/main/java/com/google/devtools/build/lib:transitive-info-provider", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/skyframe", @@ -503,8 +438,8 @@ java_library( java_library( name = "packages", exports = [ - ":foundation", - ":packages-internal", + "//src/main/java/com/google/devtools/build/lib:foundation", + "//src/main/java/com/google/devtools/build/lib:packages-internal", ], ) @@ -515,8 +450,8 @@ java_library( "rules/java/JavaToolchainDataParser.java", ], deps = [ - ":concurrent", - ":preconditions", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:preconditions", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/protobuf:build_java_proto", "//third_party:guava", @@ -534,7 +469,7 @@ java_library( name = "skylark-provider-collection", srcs = ["analysis/SkylarkProviderCollection.java"], deps = [ - ":packages-internal", + "//src/main/java/com/google/devtools/build/lib:packages-internal", "//third_party:jsr305", ], ) @@ -546,7 +481,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/config:__pkg__", ], deps = [ - ":build-base", + "//src/main/java/com/google/devtools/build/lib:build-base", ], ) @@ -582,28 +517,28 @@ java_library( "runtime/BuildEventStreamerUtils.java", ], exports = [ - ":transitive-info-provider", + "//src/main/java/com/google/devtools/build/lib:transitive-info-provider", ], deps = [ - ":base-util", - ":buildeventstream", - ":collect", - ":concurrent", - ":events", - ":exitcode-external", - ":io", - ":os_util", - ":packages-internal", - ":skylark-provider-collection", - ":skylarkinterface", - ":syntax", - ":transitive-info-provider", - ":unix", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:base-util", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:exitcode-external", + "//src/main/java/com/google/devtools/build/lib:io", + "//src/main/java/com/google/devtools/build/lib:os_util", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:skylark-provider-collection", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:syntax", + "//src/main/java/com/google/devtools/build/lib:transitive-info-provider", + "//src/main/java/com/google/devtools/build/lib:unix", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/analysis/platform:utils", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/causes", "//src/main/java/com/google/devtools/build/lib/cmdline", @@ -629,8 +564,8 @@ java_library( name = "BazelPackageLoader", srcs = glob(["skyframe/packages/*.java"]), deps = [ - ":bazel-rules", - ":build-base", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", + "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:io", @@ -664,25 +599,25 @@ java_library( ], ), deps = [ - ":RpcSupport", - ":android-rules", - ":bazel", - ":bazel-repository", - ":build-base", - ":build-info", - ":buildeventstream", - ":collect", - ":concurrent", - ":core-rules", - ":events", - ":java-compilation", - ":java-rules", - ":packages-internal", - ":proto-rules", - ":python-rules", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:RpcSupport", + "//src/main/java/com/google/devtools/build/lib:android-rules", + "//src/main/java/com/google/devtools/build/lib:bazel", + "//src/main/java/com/google/devtools/build/lib:bazel-repository", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:build-info", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:java-compilation", + "//src/main/java/com/google/devtools/build/lib:java-rules", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:proto-rules", + "//src/main/java/com/google/devtools/build/lib:python-rules", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/query2:query-output", "//src/main/java/com/google/devtools/build/lib/rules/apple", @@ -717,22 +652,22 @@ java_library( "bazel/rules/sh/sh_stub_template_windows.txt", ], deps = [ - ":bazel", - ":bazel-commands", - ":bazel-repository", - ":bazel-rules", - ":build-base", - ":build-info", - ":buildeventservice", - ":clock", - ":events", - ":io", - ":packages-internal", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:bazel", + "//src/main/java/com/google/devtools/build/lib:bazel-commands", + "//src/main/java/com/google/devtools/build/lib:bazel-repository", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:build-info", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:io", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", + "//src/main/java/com/google/devtools/build/lib/buildeventservice", "//src/main/java/com/google/devtools/build/lib/remote", "//src/main/java/com/google/devtools/build/lib/sandbox", "//src/main/java/com/google/devtools/build/lib/shell", @@ -751,14 +686,14 @@ java_library( srcs = glob(["bazel/commands/*.java"]), resources = ["bazel/commands/fetch.txt"], deps = [ - ":events", - ":exitcode-external", - ":java-compilation", - ":java-rules", - ":packages-internal", - ":runtime", - ":util", "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:exitcode-external", + "//src/main/java/com/google/devtools/build/lib:java-compilation", + "//src/main/java/com/google/devtools/build/lib:java-rules", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:runtime", + "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/build/lib/query2:query-engine", "//src/main/java/com/google/devtools/common/options", @@ -789,20 +724,20 @@ java_library( "//third_party:slf4j", ], deps = [ - ":buildeventstream", - ":concurrent", - ":events", - ":maven-connector", - ":runtime", - ":util", "//src/java_tools/singlejar/java/com/google/devtools/build/zip", "//src/main/java/com/google/devtools/build/lib:build-base", + "//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:io", + "//src/main/java/com/google/devtools/build/lib:maven-connector", "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:runtime", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", @@ -836,12 +771,12 @@ java_library( ["rules/nativedeps/*.java"], ), deps = [ - ":build-base", - ":collect", - ":concurrent", - ":packages-internal", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//third_party:guava", @@ -856,13 +791,13 @@ java_library( ["rules/proto/*.java"], ), deps = [ - ":build-base", - ":collect", - ":concurrent", - ":packages-internal", - ":skylarkinterface", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/common/options", "//third_party:auto_value", @@ -918,18 +853,18 @@ java_library( "rules/java/proto/StrictDepsUtils.java", ], deps = [ - ":RpcSupport", - ":build-base", - ":collect", - ":concurrent", - ":events", - ":java-compilation", - ":java-implicit-attributes", - ":packages-internal", - ":proto-rules", - ":skylarkinterface", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:RpcSupport", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:java-compilation", + "//src/main/java/com/google/devtools/build/lib:java-implicit-attributes", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:proto-rules", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/lib/shell", @@ -947,11 +882,11 @@ java_library( name = "RpcSupport", srcs = ["rules/java/proto/RpcSupport.java"], deps = [ - ":build-base", - ":collect", - ":java-compilation", - ":packages-internal", - ":proto-rules", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:java-compilation", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:proto-rules", "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", ], @@ -1004,16 +939,16 @@ java_library( "rules/java/proto/GeneratedExtensionRegistryProvider.java", ], deps = [ - ":build-base", - ":build-info", - ":collect", - ":concurrent", - ":events", - ":java-implicit-attributes", - ":packages-internal", - ":skylarkinterface", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:build-info", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:java-implicit-attributes", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/cpp", @@ -1038,7 +973,7 @@ java_library( ["rules/core/*.java"], ), deps = [ - ":build-base", + "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib/rules/config", "//third_party:guava", ], @@ -1056,18 +991,18 @@ java_library( "rules/android/test_suite_property_name.txt", ], deps = [ - ":build-base", - ":collect", - ":concurrent", - ":events", - ":java-compilation", - ":java-rules", - ":nativedeps-rules", - ":packages-internal", - ":proto-rules", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:java-compilation", + "//src/main/java/com/google/devtools/build/lib:java-rules", + "//src/main/java/com/google/devtools/build/lib:nativedeps-rules", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:proto-rules", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/build/lib/rules/cpp", @@ -1088,13 +1023,13 @@ java_library( ["rules/python/*.java"], ), deps = [ - ":build-base", - ":collect", - ":concurrent", - ":packages-internal", - ":skylarkinterface", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/common/options", @@ -1109,12 +1044,12 @@ java_library( java_library( name = "shared-base-rules", exports = [ - ":android-rules", - ":java-compilation", - ":java-rules", - ":nativedeps-rules", - ":proto-rules", - ":python-rules", + "//src/main/java/com/google/devtools/build/lib:android-rules", + "//src/main/java/com/google/devtools/build/lib:java-compilation", + "//src/main/java/com/google/devtools/build/lib:java-rules", + "//src/main/java/com/google/devtools/build/lib:nativedeps-rules", + "//src/main/java/com/google/devtools/build/lib:proto-rules", + "//src/main/java/com/google/devtools/build/lib:python-rules", ], ) @@ -1131,24 +1066,24 @@ java_library( ], ), deps = [ - ":build-base", - ":buildeventstream", - ":clock", - ":collect", - ":concurrent", - ":events", - ":exitcode-external", - ":io", - ":packages-internal", - ":process_util", - ":shared-base-rules", - ":unix", - ":util", - ":vfs", - ":windows", "//src/main/java/com/google/devtools/build/docgen:docgen_javalib", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:clock", + "//src/main/java/com/google/devtools/build/lib:collect", + "//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:exitcode-external", + "//src/main/java/com/google/devtools/build/lib:io", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:process_util", + "//src/main/java/com/google/devtools/build/lib:shared-base-rules", + "//src/main/java/com/google/devtools/build/lib:unix", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib:windows", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/exec/local", @@ -1196,19 +1131,19 @@ java_library( "runtime/commands/*.txt", "runtime/mobileinstall/*.txt", ]) + [ - ":runtime/commands/LICENSE", + "//src/main/java/com/google/devtools/build/lib:runtime/commands/LICENSE", ], - exports = [":runtime"], + exports = ["//src/main/java/com/google/devtools/build/lib:runtime"], ) java_library( name = "all-build-rules", exports = [ - ":build-base", - ":concurrent", - ":packages-internal", - ":util", - ":vfs", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:concurrent", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/build/lib/rules/objc", @@ -1220,11 +1155,11 @@ java_library( java_library( name = "build", exports = [ - ":all-build-rules", - ":build-base", - ":foundation", - ":packages", - ":query2", + "//src/main/java/com/google/devtools/build/lib:all-build-rules", + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:foundation", + "//src/main/java/com/google/devtools/build/lib:packages", + "//src/main/java/com/google/devtools/build/lib:query2", "//src/main/java/com/google/devtools/build/lib/actions", ], ) @@ -1237,12 +1172,12 @@ java_library( java_library( name = "query2", exports = [ - ":concurrent", - ":events", - ":foundation", - ":packages", - ":util", - ":vfs", + "//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:foundation", + "//src/main/java/com/google/devtools/build/lib:packages", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/common/options", @@ -1259,8 +1194,8 @@ java_binary( ], main_class = "com.google.devtools.build.lib.bazel.BazelMain", runtime_deps = [ - ":bazel-main", - ":single-line-formatter", # See startup_options.cc + "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:single-line-formatter", # See startup_options.cc ], ) @@ -1282,7 +1217,7 @@ filegroup( genrule( name = "gen_buildencyclopedia", - srcs = [":docs_embedded_in_sources"], + srcs = ["//src/main/java/com/google/devtools/build/lib:docs_embedded_in_sources"], outs = ["build-encyclopedia.zip"], cmd = ( "mkdir -p $(@D)/be && " + @@ -1320,7 +1255,7 @@ genrule( "cat $(location //site:command-line-reference-suffix.html) >> $@" ), tools = [ - ":bazel/BazelServer", + "//src/main/java/com/google/devtools/build/lib:bazel/BazelServer", ], visibility = [ "//site:__pkg__", diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD index 416b15f1e5..7353d20180 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/BUILD +++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD @@ -1,5 +1,8 @@ -package( - default_visibility = ["//src:__subpackages__"], +package(default_visibility = ["//src:__subpackages__"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]), ) # Action graph and cache. @@ -10,7 +13,6 @@ java_library( "cache/*.java", ]), deps = [ - "//src/main/java/com/google/devtools/build/lib:buildeventstream", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:concurrent", "//src/main/java/com/google/devtools/build/lib:events", @@ -20,6 +22,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:unix", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/causes", "//src/main/java/com/google/devtools/build/lib/profiler", @@ -34,9 +37,3 @@ java_library( "//third_party/protobuf:protobuf_java", ], ) - -filegroup( - name = "srcs", - testonly = 0, # All srcs should be not test only, overwrite package default. - srcs = glob(["**"]), -) diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/BUILD b/src/main/java/com/google/devtools/build/lib/authandtls/BUILD new file mode 100644 index 0000000000..0e4f89fb96 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/authandtls/BUILD @@ -0,0 +1,21 @@ +package(default_visibility = ["//src:__subpackages__"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) + +java_library( + name = "authandtls", + srcs = glob(["*.java"]), + deps = [ + "//src/main/java/com/google/devtools/common/options", + "//third_party:apache_httpclient", + "//third_party:apache_httpcore", + "//third_party:auth", + "//third_party:guava", + "//third_party:jsr305", + "//third_party:netty", + "//third_party/grpc:grpc-jar", + ], +) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD index ff539572c8..92900c2282 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD @@ -12,7 +12,6 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:buildeventstream", "//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-internal", @@ -20,6 +19,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:guava", "//third_party:jsr305", diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventservice/BUILD new file mode 100644 index 0000000000..5775e4b698 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BUILD @@ -0,0 +1,36 @@ +package(default_visibility = ["//src:__subpackages__"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) + +java_library( + name = "buildeventservice", + srcs = glob(["*.java"]), + visibility = [ + "//visibility:public", + ], + deps = [ + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:io", + "//src/main/java/com/google/devtools/build/lib:runtime", + "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib/authandtls", + "//src/main/java/com/google/devtools/build/lib/buildeventservice/client", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", + "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", + "//src/main/java/com/google/devtools/build/lib/buildeventstream/transports", + "//src/main/java/com/google/devtools/common/options", + "//third_party:guava", + "//third_party:jsr305", + "//third_party/grpc:grpc-jar", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", + "@com_google_protobuf//:well_known_types_any_proto", + "@googleapis//:google_devtools_build_v1_build_events_java_proto", + "@googleapis//:google_devtools_build_v1_build_status_java_proto", + "@googleapis//:google_devtools_build_v1_publish_build_event_java_proto", + ], +) diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/client/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventservice/client/BUILD index 23d349250a..91c8e523b4 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventservice/client/BUILD +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/client/BUILD @@ -1,16 +1,13 @@ +package(default_visibility = ["//src:__subpackages__"]) + filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//src/main/java/com/google/devtools/build/lib:__pkg__"], ) java_library( name = "client", srcs = glob(["*.java"]), - visibility = [ - "//src/main/java/com/google/devtools/build/lib:__pkg__", - "//src/test/java/com/google/devtools/build/lib/buildeventservice:__pkg__", - ], runtime_deps = [ # This is required for client TLS. "//third_party:netty_tcnative", diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventstream/BUILD new file mode 100644 index 0000000000..8d1791e99a --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BUILD @@ -0,0 +1,22 @@ +package(default_visibility = ["//src:__subpackages__"]) + +# External build-event reporting infrastructure +java_library( + name = "buildeventstream", + srcs = glob(["*.java"]), + deps = [ + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", + "//src/main/java/com/google/devtools/build/lib/causes", + "//src/main/java/com/google/devtools/build/lib/cmdline", + "//third_party:guava", + "//third_party:jsr305", + "//third_party/protobuf:protobuf_java", + ], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD index e75fb5c1b8..26491d6f0f 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD @@ -9,8 +9,8 @@ java_library( name = "transports", srcs = glob(["*.java"]), deps = [ - "//src/main/java/com/google/devtools/build/lib:buildeventstream", "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", diff --git a/src/main/java/com/google/devtools/build/lib/remote/BUILD b/src/main/java/com/google/devtools/build/lib/remote/BUILD index 7ac49b789f..6776bda46b 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/BUILD +++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD @@ -11,9 +11,7 @@ java_library( "//third_party:netty_tcnative", ], deps = [ - "//src/main/java/com/google/devtools/build/lib:auth_and_tls_options", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:buildeventstream", "//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:io", @@ -22,6 +20,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/authandtls", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/exec/apple", "//src/main/java/com/google/devtools/build/lib/exec/local", "//src/main/java/com/google/devtools/build/lib/standalone", diff --git a/src/main/java/com/google/devtools/build/lib/shell/BUILD b/src/main/java/com/google/devtools/build/lib/shell/BUILD index d2d788c1be..bae23e8058 100644 --- a/src/main/java/com/google/devtools/build/lib/shell/BUILD +++ b/src/main/java/com/google/devtools/build/lib/shell/BUILD @@ -1,5 +1,8 @@ -package( - default_visibility = ["//src:__subpackages__"], +package(default_visibility = ["//src:__subpackages__"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]), ) # Library for dealing with executable commands, including their arguments and runtime environment @@ -23,8 +26,3 @@ bootstrap_java_library( srcs = glob(["*.java"]), jars = ["//third_party:bootstrap_guava_and_error_prone-jars"], ) - -filegroup( - name = "srcs", - srcs = glob(["**"]), -) |