Skip to content

P
protobuf
Unverified Commit aa368855 authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub
Browse files
Options

Merge pull request #5404 from acozzette/cherry-pick-4650 

Cherry-picked fix from PR #4650 into 3.6.x branch
parents 046e8fb7 af481066
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
protobuf.bzl
View file @ aa368855
...@@ -266,8 +266,8 @@ def internal_gen_well_known_protos_java(srcs): ...@@ -266,8 +266,8 @@ def internal_gen_well_known_protos_java(srcs):
Args: Args:
srcs: the well known protos srcs: the well known protos
""" """
root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root root = Label("%s//protobuf_java" % (native.repository_name())).workspace_root
pkg = PACKAGE_NAME + "/" if PACKAGE_NAME else "" pkg = native.package_name() + "/" if native.package_name() else ""
if root == "": if root == "":
include = " -I%ssrc " % pkg include = " -I%ssrc " % pkg
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment