Merge pull request #1278 from smparkes/master
pass correct args to protoc for wellknown protos when used as an external repository
diff --git a/BUILD b/BUILD
index 9cbddd5..32fd669 100644
--- a/BUILD
+++ b/BUILD
@@ -22,6 +22,7 @@
"protobuf",
"cc_proto_library",
"py_proto_library",
+ "internal_gen_well_known_protos_java",
"internal_protobuf_py_tests",
)
@@ -457,16 +458,8 @@
################################################################################
# Java support
################################################################################
-genrule(
- name = "gen_well_known_protos_java",
+internal_gen_well_known_protos_java(
srcs = WELL_KNOWN_PROTOS,
- outs = [
- "wellknown.srcjar",
- ],
- cmd = "$(location :protoc) --java_out=$(@D)/wellknown.jar" +
- " -Isrc $(SRCS) " +
- " && mv $(@D)/wellknown.jar $(@D)/wellknown.srcjar",
- tools = [":protoc"],
)
java_library(
diff --git a/protobuf.bzl b/protobuf.bzl
index 71eaba2..fbcae0b 100644
--- a/protobuf.bzl
+++ b/protobuf.bzl
@@ -199,6 +199,31 @@
includes=includes,
**kargs)
+
+def internal_gen_well_known_protos_java(srcs):
+ """Bazel rule to generate the gen_well_known_protos_java genrule
+
+ Args:
+ srcs: the well known protos
+ """
+ root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root
+ if root == "":
+ include = " -Isrc "
+ else:
+ include = " -I%s/src " % root
+ native.genrule(
+ name = "gen_well_known_protos_java",
+ srcs = srcs,
+ outs = [
+ "wellknown.srcjar",
+ ],
+ cmd = "$(location :protoc) --java_out=$(@D)/wellknown.jar" +
+ " %s $(SRCS) " % include +
+ " && mv $(@D)/wellknown.jar $(@D)/wellknown.srcjar",
+ tools = [":protoc"],
+ )
+
+
def py_proto_library(
name,
srcs=[],