parent
112fa94402
commit
232ecf4a6f
|
@ -1,11 +1,11 @@
|
|||
--- bazel/build_defs.bzl
|
||||
+++ bazel/build_defs.bzl
|
||||
@@ -33,6 +33,8 @@ _DEFAULT_CPPOPTS.extend([
|
||||
"-Wextra",
|
||||
# "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang)
|
||||
"-Werror",
|
||||
+ # TODO(b/265232445) This is required due to https://github.com/abseil/abseil-cpp/issues/1201.
|
||||
+ "-Wno-deprecated",
|
||||
"-Wno-unused-parameter",
|
||||
"-Wno-long-long",
|
||||
])
|
||||
--- upbc/bootstrap_compiler.bzl
|
||||
+++ upbc/bootstrap_compiler.bzl
|
||||
@@ -20,7 +20,7 @@ _upbc_base = "//upbc:protoc-gen-upb"
|
||||
|
||||
# begin:github_only
|
||||
_is_google3 = False
|
||||
-_extra_proto_path = "-Iexternal/com_google_protobuf/src "
|
||||
+_extra_proto_path = "-Isrc "
|
||||
# end:github_only
|
||||
|
||||
def _upbc(stage):
|
||||
|
|
|
@ -32,5 +32,3 @@ Required.Proto3.ProtobufInput.ValidDataOneof.MESSAGE.Merge.ProtobufOutput
|
|||
Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.JsonOutput
|
||||
Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.JsonOutput
|
||||
Required.Proto3.ProtobufInput.ValidDataScalar.FLOAT[2].JsonOutput
|
||||
Recommended.ValueRejectInfNumberValue.JsonOutput
|
||||
Recommended.ValueRejectNanNumberValue.JsonOutput
|
||||
|
|
|
@ -2,5 +2,3 @@ Recommended.Proto2.JsonInput.FieldNameExtension.Validator
|
|||
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput
|
||||
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput
|
||||
Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator
|
||||
Recommended.ValueRejectInfNumberValue.JsonOutput
|
||||
Recommended.ValueRejectNanNumberValue.JsonOutput
|
|
@ -58,5 +58,3 @@ Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOu
|
|||
Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
|
||||
Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
|
||||
Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
|
||||
Recommended.ValueRejectInfNumberValue.JsonOutput
|
||||
Recommended.ValueRejectNanNumberValue.JsonOutput
|
||||
|
|
|
@ -27,6 +27,5 @@ update_staleness() {
|
|||
done
|
||||
}
|
||||
|
||||
update_staleness ruby test_amalgamation_staleness ruby/ext/google/protobuf_c ruby-upb.*
|
||||
update_staleness ruby/ext/google/protobuf_c test_amalgamation_staleness ruby/ext/google/protobuf_c ruby-upb.*
|
||||
update_staleness php test_amalgamation_staleness php/ext/google/protobuf php-upb.*
|
||||
update_staleness src cmake_lists_staleness_test src file_lists.cmake
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -150,7 +150,7 @@ def protobuf_deps():
|
|||
_github_archive(
|
||||
name = "upb",
|
||||
repo = "https://github.com/protocolbuffers/upb",
|
||||
commit = "0c6b72dbf891eafc91050ad60733ea3022fac2b3",
|
||||
sha256 = "9c8cdfa013450548c9f03fac8e1390aeb21a75413f443790815b71d475c9af49",
|
||||
commit = "5d4d54d387a6cccc7cbebec797cc253d58b42c69",
|
||||
sha256 = "81acf80e2b452c051ae6239f2ead4f1b56056d7256daea1292d3a423151518e8",
|
||||
patches = ["@com_google_protobuf//build_defs:upb.patch"],
|
||||
)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -192,6 +192,12 @@ filegroup(
|
|||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "plugin_proto_src",
|
||||
srcs = ["plugin.proto"],
|
||||
visibility = ["@upb//:__subpackages__"],
|
||||
)
|
||||
|
||||
exports_files(
|
||||
srcs = ["plugin.proto"],
|
||||
visibility = ["//:__pkg__"],
|
||||
|
|
Loading…
Reference in New Issue