aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--examples/proto/BUILD6
-rw-r--r--src/main/protobuf/BUILD6
-rw-r--r--tools/build_rules/genproto.bzl7
3 files changed, 12 insertions, 7 deletions
diff --git a/examples/proto/BUILD b/examples/proto/BUILD
index def85a789f..0d3108176e 100644
--- a/examples/proto/BUILD
+++ b/examples/proto/BUILD
@@ -1,14 +1,14 @@
package(default_visibility = ["//visibility:public"])
-load("//tools/build_rules:genproto.bzl", "proto_java_library")
+load("//tools/build_rules:genproto.bzl", "java_proto_library")
proto_library(
name = "proto_smoke_test",
srcs = ["test.proto"],
)
-# proto_java_library is a quick and dirty rule to help Bazel compile itself.
-proto_java_library(
+# java_proto_library is a quick and dirty rule to help Bazel compile itself.
+java_proto_library(
name = "test_proto",
src = "test.proto",
)
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 49546fed83..2255a27816 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])
-load("//tools/build_rules:genproto.bzl", "proto_java_library")
+load("//tools/build_rules:genproto.bzl", "java_proto_library")
FILES = [
"build",
@@ -20,12 +20,12 @@ FILES = [
"remote_protocol",
]
-[proto_java_library(
+[java_proto_library(
name = s + "_proto",
src = s + ".proto",
) for s in FILES]
-proto_java_library(
+java_proto_library(
name = "build_proto_v2",
src = "build.proto",
)
diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl
index 47715df499..2a59791a2a 100644
--- a/tools/build_rules/genproto.bzl
+++ b/tools/build_rules/genproto.bzl
@@ -65,7 +65,7 @@ gensrcjar = rule(
)
# TODO(bazel-team): support proto => proto dependencies too
-def proto_java_library(name, src):
+def java_proto_library(name, src):
gensrcjar(name=name + "_srcjar", src=src)
native.java_library(
name=name,
@@ -74,3 +74,8 @@ def proto_java_library(name, src):
# The generated code has lots of 'rawtypes' warnings.
javacopts=["-Xlint:-rawtypes"],
)
+
+def proto_java_library(name, src):
+ print("Deprecated: use java_proto_library() instead, proto_java_library " +
+ "will be removed in version 0.2.1")
+ java_proto_library(name, src)