aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell
diff options
context:
space:
mode:
authorGravatar Han-Wen Nienhuys <hanwen@google.com>2015-06-01 15:57:50 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-06-02 14:39:13 +0000
commite01aa680eb13dc3c796eeac2393bd2f4ec37fdb7 (patch)
treef05e95ef33c236ddb175edfb2e3b35a1d873880c /src/test/shell
parent5fe79331f9160ae8b37f907ddbaa5f080dfc8185 (diff)
Simplify genproto.bzl.
Generate a srcjar artifact, and use native.java_library to emit the actual jar file. Post-review modifications: - Formatted genproto.bzl - Use //external:jar instead of relying on PATH - Make proto library a java_import instead of a filegroup in test setup. -- Change-Id: I005f801f09439bbca43e483ad4a47da4588fea94 Reviewed-on: https://bazel-review.googlesource.com/1362 MOS_MIGRATED_REVID=94914935
Diffstat (limited to 'src/test/shell')
-rwxr-xr-xsrc/test/shell/bazel/test-setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index a0fe04aa00..ae134866cc 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -53,9 +53,9 @@ function setup_protoc_support() {
cat <<EOF > third_party/BUILD
package(default_visibility = ["//visibility:public"])
exports_files(["protoc"])
-filegroup(
+java_import(
name = "protobuf",
- srcs = [ "protobuf-java.jar"])
+ jars = ["protobuf-java.jar"])
EOF
}