From 6fffd4adb4dc6c27784be18132ec0b7254b927cc Mon Sep 17 00:00:00 2001
From: cgrushko <carmi.grushko@gmail.com>
Date: Wed, 8 Feb 2017 12:19:40 -0500
Subject: Bazel can build protobuf when it's not in the root

That is, Bazel can now build protobuf when the latter resides in a subdirectory of a project.
---
 protobuf.bzl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'protobuf.bzl')

diff --git a/protobuf.bzl b/protobuf.bzl
index 41a46f75..73c396d5 100644
--- 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,
-- 
cgit v1.2.3