Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The custom commit contains a fix to make protobuf.bzl compatible with Bazel 0.26 or later version. Also fix WORKSPACE file to make sure tf_workspace() always takes priority over dependency definitions of other repositories. PiperOrigin-RevId: 253970221
- Loading branch information
1 parent
a98b781
commit 508f76b
Showing
3 changed files
with
46 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/BUILD b/BUILD | ||
index 2fb26050..c2744d5b 100644 | ||
--- a/BUILD | ||
+++ b/BUILD | ||
@@ -19,7 +19,7 @@ config_setting( | ||
# ZLIB configuration | ||
################################################################################ | ||
|
||
-ZLIB_DEPS = ["@zlib//:zlib"] | ||
+ZLIB_DEPS = ["@zlib_archive//:zlib"] | ||
|
||
################################################################################ | ||
# Protobuf Runtime Library | ||
@@ -218,7 +218,7 @@ cc_library( | ||
# TODO(keveman): Remove this target once the support gets added to Bazel. | ||
cc_library( | ||
name = "protobuf_headers", | ||
- hdrs = glob(["src/**/*.h"]), | ||
+ hdrs = glob(["src/**/*.h", "src/**/*.inc"]), | ||
includes = ["src/"], | ||
visibility = ["//visibility:public"], | ||
) |