Merge pull request #2691 from cgrushko/patch-3

Bazel can build protobuf when it's not in the root
8 years ago · a60cc08d83
parent cba04b19e8 6fffd4adb4
commit a60cc08d83
1 changed files with 3 additions and 2 deletions
--- a/protobuf.bzl
+++ b/protobuf.bzl
@ -263,10 +263,11 @@ def internal_gen_well_known_protos_java(srcs):
    srcs: the well known protos
  """
  root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root
+  pkg = PACKAGE_NAME + "/" if PACKAGE_NAME else ""
  if root == "":
-    include = " -Isrc "
+    include = " -I%ssrc " % pkg
  else:
-    include = " -I%s/src " % root
+    include = " -I%s/%ssrc " % (root, pkg)
  native.genrule(
    name = "gen_well_known_protos_java",
    srcs = srcs,