Skip to content

Commit

Permalink
Fix wkt dupes (#8942)
Browse files Browse the repository at this point in the history
* properly ignore WKTs in lang_proto_toolchain for java

We already pre-compile the well known types into the runtimes so they shouldn't be re-compiled. #8925

* remove accidental proto addition.
  • Loading branch information
perezd committed Oct 21, 2021
1 parent f4af0bc commit adc1f93
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
15 changes: 15 additions & 0 deletions java/core/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,21 @@ proto_lang_toolchain(
command_line = "--java_out=$(OUT)",
runtime = ":core",
visibility = ["//visibility:public"],
# keep this in sync w/ WELL_KNOWN_PROTO_MAP in //:BUILD
blacklisted_protos = [
"//:any_proto",
"//:api_proto",
"//:compiler_plugin_proto",
"//:descriptor_proto",
"//:duration_proto",
"//:empty_proto",
"//:field_mask_proto",
"//:source_context_proto",
"//:struct_proto",
"//:timestamp_proto",
"//:type_proto",
"//:wrappers_proto",
],
)

proto_library(
Expand Down
13 changes: 13 additions & 0 deletions java/lite/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ proto_lang_toolchain(
command_line = "--java_out=lite:$(OUT)",
runtime = ":lite",
visibility = ["//visibility:public"],
# keep this in sync w/ LITE_WELL_KNOWN_PROTO_MAP in //:BUILD
blacklisted_protos = [
"//:any_proto",
"//:api_proto",
"//:duration_proto",
"//:empty_proto",
"//:field_mask_proto",
"//:source_context_proto",
"//:struct_proto",
"//:timestamp_proto",
"//:type_proto",
"//:wrappers_proto",
],
)

test_suite(
Expand Down

0 comments on commit adc1f93

Please sign in to comment.