diff options
| author | Donald Duo Zhao <deltazulu@google.com> | 2023-03-03 00:03:33 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-03 00:04:07 -0800 |
| commit | d806b788f9f90743082e128fc59a60926b803fe1 (patch) | |
| tree | 9f6e3aa57be38ccf45d2ffacd60fface1ac08650 | |
| parent | 9669bbed48b61847e6ed29b058be59d0b76d9bf9 (diff) | |
| download | bazelbuild-kotlin-rules-d806b788f9f90743082e128fc59a60926b803fe1.tar.gz | |
NONE
PiperOrigin-RevId: 513744761
| -rw-r--r-- | kotlin/common.bzl | 11 | ||||
| -rw-r--r-- | kotlin/jvm/internal_do_not_use/util/class_file_selectors.bzl | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kotlin/common.bzl b/kotlin/common.bzl index b4b5639..d5356bd 100644 --- a/kotlin/common.bzl +++ b/kotlin/common.bzl @@ -939,7 +939,16 @@ def _kt_jvm_library( java_gensrcjar = None java_genjar = None if pre_processed_processors: - java_gensrcjar = kt_codegen_processing_env["java_info_generated_source_jar"][0] + java_gen_srcjars = kt_codegen_processing_env["java_gen_srcjar"] + kt_gen_srcjars = kt_codegen_processing_env["kt_gen_srcjar"] + java_gensrcjar = file_factory.declare_file("-java_info_generated_source_jar.srcjar") + _singlejar( + ctx, + inputs = java_gen_srcjars + kt_gen_srcjars, + output = java_gensrcjar, + singlejar = java_toolchain.single_jar, + mnemonic = "JavaInfoGeneratedSourceJar", + ) elif javac_java_info: java_gensrcjar = javac_java_info.annotation_processing.source_jar diff --git a/kotlin/jvm/internal_do_not_use/util/class_file_selectors.bzl b/kotlin/jvm/internal_do_not_use/util/class_file_selectors.bzl index 235e571..d5341c8 100644 --- a/kotlin/jvm/internal_do_not_use/util/class_file_selectors.bzl +++ b/kotlin/jvm/internal_do_not_use/util/class_file_selectors.bzl @@ -40,7 +40,7 @@ def gen_java_info_generated_class_jar(ctx, file_factory, kt_toolchain, input_jar args.add_joined("--input_jars", input_jars, join_with = ",") args.add_joined("--transformer_jars", transformer_jars, join_with = ",") args.add("--transformer_entry_point", transformer_entry_point) - args.add_all("--transformer_env_files", transformer_env_files) + args.add_joined("--transformer_env_files", transformer_env_files, join_with = ",") args.add("--result", output_jar) ctx.actions.run( inputs = depset(transitive = [ |