diff options
author | Feng Xiao <xiaofeng@google.com> | 2016-01-22 11:29:34 -0800 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2016-01-22 11:29:34 -0800 |
commit | 60f7fc51fb01ac98fd64d9372e7547f5ab267ce5 (patch) | |
tree | 09ce6abe7f6b5898ca290a35defa616f513640e5 | |
parent | c65be832005cd8587dca1b18414eba57b22546eb (diff) | |
parent | 4fe03816b133f4cdf9229a316e1aa174a88be349 (diff) | |
download | protobuf-60f7fc51fb01ac98fd64d9372e7547f5ab267ce5.tar.gz protobuf-60f7fc51fb01ac98fd64d9372e7547f5ab267ce5.tar.bz2 protobuf-60f7fc51fb01ac98fd64d9372e7547f5ab267ce5.zip |
Merge pull request #1169 from LuminateWireless/bazel-build
Fix bazel BUILD for Java.
-rw-r--r-- | BUILD | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -459,19 +459,23 @@ cc_test( # Java support ################################################################################ genrule( - name = "generate_java_descriptor_proto", - srcs = ["src/google/protobuf/descriptor.proto"], - outs = ["com/google/protobuf/DescriptorProtos.java"], - cmd = "$(location :protoc) --java_out=$(@D)/../../.. $<", + name = "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( name = "protobuf_java", srcs = glob([ - "java/src/main/java/com/google/protobuf/*.java", + "java/core/src/main/java/com/google/protobuf/*.java", ]) + [ - ":generate_java_descriptor_proto", + ":gen_well_known_protos_java", ], visibility = ["//visibility:public"], ) |