Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[protobuf] Load C++,Java,Protobuf rules from Starlark #9001

Closed
wants to merge 1 commit into from
Closed

[protobuf] Load C++,Java,Protobuf rules from Starlark #9001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions third_party/protobuf/3.6.1/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Bazel (http://bazel.io/) BUILD file for Protobuf.

load("@rules_java//java:defs.bzl", "java_import")
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test", "objc_library")
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("@rules_python//python:defs.bzl", "py_library")

licenses(["notice"])

Expand All @@ -24,9 +27,6 @@ config_setting(
load(":protobuf.bzl", "py_proto_library")
load(":compiler_config_setting.bzl", "create_compiler_config_setting")

# Needed for #9006. Hopefully a future upstream version will include this line.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR to Protobuf to fix this, so I don't think this comment is needed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow. You're awesome :)

load("@rules_python//python:defs.bzl", "py_library")

filegroup(
name = "srcs",
srcs = glob(
Expand Down
6 changes: 3 additions & 3 deletions third_party/protobuf/3.6.1/protobuf.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Needed for #9006. Hopefully a future upstream version will include this line.
load("@rules_cc//cc:defs.bzl", "cc_library")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

def _GetPath(ctx, path):
Expand Down Expand Up @@ -227,7 +227,7 @@ def cc_proto_library(
)

# An empty cc_library to make rule dependency consistent.
native.cc_library(
cc_library(
name = name,
**kargs
)
Expand Down Expand Up @@ -259,7 +259,7 @@ def cc_proto_library(
if use_grpc_plugin:
cc_libs = cc_libs + ["//external:grpc_lib"]

native.cc_library(
cc_library(
name = name,
srcs = gen_srcs,
hdrs = gen_hdrs,
Expand Down
2 changes: 2 additions & 0 deletions third_party/protobuf/3.6.1/util/python/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_cc//cc:defs.bzl", "cc_library")

# This is a placeholder for python headers. Projects needing to use
# fast cpp protos in protobuf's python interface should build with
# --define=use_fast_cpp_protos=true, and in addition, provide
Expand Down