diff options
| author | Jisi Liu <liujisi@google.com> | 2016-03-11 16:58:15 -0800 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-03-11 16:58:15 -0800 |
| commit | c71f1847c889073f5036f4be8b76973e19e16631 (patch) | |
| tree | 38fe134d2b2e9ee5db653b5fcb1bbfa1ad544032 /BUILD | |
| parent | dfaf1aac309c1b65679bb28fb593303ae3e8d170 (diff) | |
| parent | ea1886661e1ad607e7cac03f0e720c9ab337686e (diff) | |
| download | protobuf-c71f1847c889073f5036f4be8b76973e19e16631.tar.gz protobuf-c71f1847c889073f5036f4be8b76973e19e16631.tar.bz2 protobuf-c71f1847c889073f5036f4be8b76973e19e16631.zip | |
Merge pull request #1278 from smparkes/master
pass correct args to protoc for wellknown protos when used as an external repository
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -22,6 +22,7 @@ load( "protobuf", "cc_proto_library", "py_proto_library", + "internal_gen_well_known_protos_java", "internal_protobuf_py_tests", ) @@ -457,16 +458,8 @@ cc_test( ################################################################################ # 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( |