In singlejar runs with --check_desugar_deps, error out when encountering j$.** files. RELNOTES: None. PiperOrigin-RevId: 190667956
diff --git a/src/tools/singlejar/output_jar.cc b/src/tools/singlejar/output_jar.cc index f032347..1bd78da 100644 --- a/src/tools/singlejar/output_jar.cc +++ b/src/tools/singlejar/output_jar.cc
@@ -344,6 +344,13 @@ ExtraHandler(jar_entry, &input_jar_aux_label); } + if (options_->check_desugar_deps && + begins_with(file_name, file_name_length, "j$/")) { + diag_errx(1, "%s:%d: desugar_jdk_libs file %.*s unexpectedly found in %s", + __FILE__, __LINE__, file_name_length, file_name, + input_jar_path.c_str()); + } + // Install a new entry unless it is already present. All the plain (non-dir) // entries that require a combiner have been already installed, so the call // will add either a directory entry whose handler will ignore subsequent