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.

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

Preparations for updating Protobuf to 3.11.3 #10723

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions third_party/protobuf/3.11.3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/BUILD b/BUILD
index 79871d621..5c347365e 100644
--- a/BUILD
+++ b/BUILD
@@ -26,7 +26,7 @@ config_setting(
# ZLIB configuration
################################################################################

-ZLIB_DEPS = ["@zlib//:zlib"]
+ZLIB_DEPS = ["@io_bazel//third_party/zlib"]

################################################################################
# Protobuf Runtime Library
@@ -787,9 +787,9 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"protobuf_java",
- "//external:error_prone_annotations",
- "//external:gson",
- "//external:guava",
+ "@io_bazel//third_party:error_prone_annotations",
+ "@io_bazel//third_party:gson",
+ "@io_bazel//third_party:guava",
],
)

@@ -900,7 +900,7 @@ py_proto_library(
py_extra_srcs = glob(["python/**/__init__.py"]),
py_libs = [
":python_srcs",
- "@six//:six",
+ "@io_bazel//third_party/py/six",
],
srcs_version = "PY2AND3",
visibility = ["//visibility:public"],
6 changes: 4 additions & 2 deletions third_party/protobuf/BUILD
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package(default_visibility = ["//visibility:public"])
load(":proto_alias.bzl", "proto_alias")

licenses(["notice"])

load(":proto_alias.bzl", "proto_alias")
package(default_visibility = ["//visibility:public"])

exports_files(["3.11.3.patch"])

PROTOBUF_VERSION = "3.6.1"

Expand Down
106 changes: 0 additions & 106 deletions third_party/protobuf/README.md

This file was deleted.