diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD index 3bc423505..716ca3f45 100644 --- a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD +++ b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD @@ -15,7 +15,7 @@ java_binary( "//src/java/io/bazel/rulesscala/io_utils", "//src/java/io/bazel/rulesscala/jar", "//src/java/io/bazel/rulesscala/worker", - "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", + "@bazel_tools//src/main/protobuf:worker_protocol_java_proto", "@bazel_tools//tools/jdk:JacocoCoverage", ], ) diff --git a/src/java/io/bazel/rulesscala/scalac/BUILD b/src/java/io/bazel/rulesscala/scalac/BUILD index 146610fd9..99cec7d48 100644 --- a/src/java/io/bazel/rulesscala/scalac/BUILD +++ b/src/java/io/bazel/rulesscala/scalac/BUILD @@ -8,7 +8,7 @@ load( SCALAC_DEPS = [ "//scala/private/toolchain_deps:scala_compile_classpath", "//src/java/io/bazel/rulesscala/io_utils", - "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", + "@bazel_tools//src/main/protobuf:worker_protocol_java_proto", "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar", "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker", "@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto", diff --git a/src/java/io/bazel/rulesscala/worker/BUILD b/src/java/io/bazel/rulesscala/worker/BUILD index 5f2337f04..0a7168e07 100644 --- a/src/java/io/bazel/rulesscala/worker/BUILD +++ b/src/java/io/bazel/rulesscala/worker/BUILD @@ -5,7 +5,7 @@ java_library( srcs = ["Worker.java"], visibility = ["//visibility:public"], deps = [ - "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", + "@bazel_tools//src/main/protobuf:worker_protocol_java_proto", ], ) @@ -20,6 +20,6 @@ java_test( test_class = "io.bazel.rulesscala.worker.WorkerTest", deps = [ ":worker", - "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", + "@bazel_tools//src/main/protobuf:worker_protocol_java_proto", ], ) diff --git a/test/BUILD b/test/BUILD index 19bacaa12..db5e8280a 100644 --- a/test/BUILD +++ b/test/BUILD @@ -540,8 +540,8 @@ scala_specs2_junit_test( name = "data_location_expansion", size = "small", srcs = ["src/main/scala/scalarules/test/location_expansion/LocationExpansionTest.scala"], - data = ["//third_party/bazel/src/main/protobuf:worker_protocol_java_proto"], - jvm_flags = ["-Dlocation.expanded='$(locations //third_party/bazel/src/main/protobuf:worker_protocol_java_proto)'"], + data = ["@bazel_tools//src/main/protobuf:worker_protocol_java_proto"], + jvm_flags = ["-Dlocation.expanded='$(locations @bazel_tools//src/main/protobuf:worker_protocol_java_proto)'"], suffixes = ["Test"], ) diff --git a/third_party/bazel/src/main/protobuf/BUILD b/third_party/bazel/src/main/protobuf/BUILD deleted file mode 100644 index a505b865d..000000000 --- a/third_party/bazel/src/main/protobuf/BUILD +++ /dev/null @@ -1,20 +0,0 @@ -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_proto//proto:defs.bzl", "proto_library") - -licenses(["notice"]) - -package(default_visibility = ["//visibility:public"]) - -FILES = [ - "worker_protocol", -] - -[proto_library( - name = s + "_proto", - srcs = [s + ".proto"], -) for s in FILES] - -[java_proto_library( - name = s + "_java_proto", - deps = [":" + s + "_proto"], -) for s in FILES] diff --git a/third_party/bazel/src/main/protobuf/worker_protocol.proto b/third_party/bazel/src/main/protobuf/worker_protocol.proto deleted file mode 100644 index c628b7eb7..000000000 --- a/third_party/bazel/src/main/protobuf/worker_protocol.proto +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2015 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package blaze.worker; - -option java_package = "com.google.devtools.build.lib.worker"; - -// An input file. -message Input { - // The path in the file system where to read this input artifact from. This is - // either a path relative to the execution root (the worker process is - // launched with the working directory set to the execution root), or an - // absolute path. - string path = 1; - - // A hash-value of the contents. The format of the contents is unspecified and - // the digest should be treated as an opaque token. - bytes digest = 2; -} - -// This represents a single work unit that Blaze sends to the worker. -message WorkRequest { - repeated string arguments = 1; - - // The inputs that the worker is allowed to read during execution of this - // request. - repeated Input inputs = 2; - - // To support multiplex worker, each WorkRequest must have an unique ID. This - // ID should be attached unchanged to the WorkResponse. - int32 request_id = 3; -} - -// The worker sends this message to Blaze when it finished its work on the -// WorkRequest message. -message WorkResponse { - int32 exit_code = 1; - - // This is printed to the user after the WorkResponse has been received and is - // supposed to contain compiler warnings / errors etc. - thus we'll use a - // string type here, which gives us UTF-8 encoding. - string output = 2; - - // To support multiplex worker, each WorkResponse must have an unique ID. - // Since worker processes which support multiplex worker will handle multiple - // WorkRequests in parallel, this ID will be used to determined which - // WorkerProxy does this WorkResponse belong to. - int32 request_id = 3; -}