Skip to content

Commit adc1f93

Browse files
authored
Fix wkt dupes (#8942)
* 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.
1 parent f4af0bc commit adc1f93

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

java/core/BUILD

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,21 @@ proto_lang_toolchain(
176176
command_line = "--java_out=$(OUT)",
177177
runtime = ":core",
178178
visibility = ["//visibility:public"],
179+
# keep this in sync w/ WELL_KNOWN_PROTO_MAP in //:BUILD
180+
blacklisted_protos = [
181+
"//:any_proto",
182+
"//:api_proto",
183+
"//:compiler_plugin_proto",
184+
"//:descriptor_proto",
185+
"//:duration_proto",
186+
"//:empty_proto",
187+
"//:field_mask_proto",
188+
"//:source_context_proto",
189+
"//:struct_proto",
190+
"//:timestamp_proto",
191+
"//:type_proto",
192+
"//:wrappers_proto",
193+
],
179194
)
180195

181196
proto_library(

java/lite/BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@ proto_lang_toolchain(
1717
command_line = "--java_out=lite:$(OUT)",
1818
runtime = ":lite",
1919
visibility = ["//visibility:public"],
20+
# keep this in sync w/ LITE_WELL_KNOWN_PROTO_MAP in //:BUILD
21+
blacklisted_protos = [
22+
"//:any_proto",
23+
"//:api_proto",
24+
"//:duration_proto",
25+
"//:empty_proto",
26+
"//:field_mask_proto",
27+
"//:source_context_proto",
28+
"//:struct_proto",
29+
"//:timestamp_proto",
30+
"//:type_proto",
31+
"//:wrappers_proto",
32+
],
2033
)
2134

2235
test_suite(

0 commit comments

Comments
 (0)