grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename source jar outputs to avoid conflicts with java_common.compile 

More information: https://github.com/bazelbuild/bazel/issues/5824
This commit is contained in:
Liam Miller-Cushon 2019-03-05 10:44:22 -05:00 committed by Eric Anderson
parent 801cc5c189
commit 952a767b9c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/kokoro/bazel.sh
View File

@ -3,7 +3,7 @@
set -exu -o pipefail set -exu -o pipefail
cat /VERSION cat /VERSION
use_bazel.sh 0.22.0 use_bazel.sh 0.23.1
bazel version bazel version
cd github/grpc-java cd github/grpc-java

9
java_grpc_library.bzl
View File

@ -20,15 +20,17 @@ def _java_rpc_library_impl(ctx):
if flavor == "normal": if flavor == "normal":
flavor = "" flavor = ""
srcjar = ctx.actions.declare_file("%s-proto-gensrc.jar" % ctx.label.name)
args = ctx.actions.args() args = ctx.actions.args()
args.add(ctx.executable._java_plugin.path, format = "--plugin=protoc-gen-grpc-java=%s") args.add(ctx.executable._java_plugin.path, format = "--plugin=protoc-gen-grpc-java=%s")
args.add("--grpc-java_out={0}:{1}".format(flavor, ctx.outputs.srcjar.path)) args.add("--grpc-java_out={0}:{1}".format(flavor, srcjar.path))
args.add_all(includes, map_each = _create_include_path) args.add_all(includes, map_each = _create_include_path)
args.add_all(srcs, map_each = _path_ignoring_repository) args.add_all(srcs, map_each = _path_ignoring_repository)
ctx.actions.run( ctx.actions.run(
inputs = depset(srcs, transitive = [includes]), inputs = depset(srcs, transitive = [includes]),
outputs = [ctx.outputs.srcjar], outputs = [srcjar],
tools = [ctx.executable._java_plugin], tools = [ctx.executable._java_plugin],
executable = ctx.executable._protoc, executable = ctx.executable._protoc,
arguments = [args], arguments = [args],
@ -40,7 +42,8 @@ def _java_rpc_library_impl(ctx):
ctx, ctx,
java_toolchain = ctx.attr._java_toolchain, java_toolchain = ctx.attr._java_toolchain,
host_javabase = ctx.attr._host_javabase, host_javabase = ctx.attr._host_javabase,
source_jars = [ctx.outputs.srcjar], source_jars = [srcjar],
output_source_jar = ctx.outputs.srcjar,
output = ctx.outputs.jar, output = ctx.outputs.jar,
deps = [ deps = [
java_common.make_non_strict(deps_java_info), java_common.make_non_strict(deps_java_info),