aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/grpc
diff options
context:
space:
mode:
authorGravatar Loo Rong Jie <loorongjie@gmail.com>2018-06-21 11:29:04 +0800
committerGravatar Jakob Buchgraber <buchgr@google.com>2018-07-09 15:50:41 +0200
commita2cac548616e6e6f433df27146c2971f352a4041 (patch)
treee05b713ab4eceb88e6686e34e2a98426b16009bc /third_party/grpc
parent4e42e1767d1752d6e3fde78a6b184c2231b12ebb (diff)
Update protobuf to 3.6.0. Fixes #5439
Diffstat (limited to 'third_party/grpc')
-rw-r--r--third_party/grpc/build_defs.bzl4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/grpc/build_defs.bzl b/third_party/grpc/build_defs.bzl
index 4240c1debf..8ae42acad2 100644
--- a/third_party/grpc/build_defs.bzl
+++ b/third_party/grpc/build_defs.bzl
@@ -6,7 +6,9 @@ load("//third_party/grpc:build_defs.bzl", "java_grpc_library")
def _path_ignoring_repository(f):
if (len(f.owner.workspace_root) == 0):
return f.short_path
- return f.path[len(f.owner.workspace_root)+1:]
+ # If |f| is a generated file, it will have "bazel-out/*/genfiles" prefix
+ # before "external/workspace", so we need to add the starting index of "external/workspace"
+ return f.path[f.path.find(f.owner.workspace_root)+len(f.owner.workspace_root)+1:]
def _gensource_impl(ctx):
if len(ctx.attr.srcs) > 1: