Skip to content

Commit

Permalink
java_grpc_library: re-add grpc-java repo to targets
Browse files Browse the repository at this point in the history
They were removed in 137c74d since it was believed they were unnecessary.
However, since they are in a macro and not a rule, they are relative to the
caller, not their definition.

Added building the examples to the kokoro CI. Note that this means the examples
are built twice: once in grpc-java's build and once in their own (because it
has a WORKSPACE). Given that the Bazel build is our fastest build, this
slowdown won't probably be an issue.
  • Loading branch information
ejona86 committed Apr 3, 2018
1 parent 1d901a8 commit ef030ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions buildscripts/kokoro/bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ cat /VERSION

cd github/grpc-java
bazel build ...

cd examples
bazel build ...
6 changes: 3 additions & 3 deletions java_grpc_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ def java_grpc_library(name, srcs, deps, flavor=None,
)

added_deps = [
"//core",
"//stub",
"//protobuf",
"@io_grpc_grpc_java//core",
"@io_grpc_grpc_java//stub",
"@io_grpc_grpc_java//protobuf",
"@com_google_guava_guava//jar",
]
if flavor == "normal":
Expand Down

0 comments on commit ef030ab

Please sign in to comment.