diff options
| author | nickreid <nickreid@google.com> | 2023-10-03 17:05:19 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-10-03 17:05:49 -0700 |
| commit | 26f928309547ba3fcfa3503898f4a74d705cea95 (patch) | |
| tree | cacdd2bfd789629f0688e6e5f581859bdfd18b12 | |
| parent | 7a8fbedcfd9b4c1121d144329d9bf3e9a3184026 (diff) | |
| download | bazelbuild-kotlin-rules-26f928309547ba3fcfa3503898f4a74d705cea95.tar.gz | |
n/a
PiperOrigin-RevId: 570538441
Change-Id: I8086b8b12269aa13c17f06f60127c90360aa9324
| -rw-r--r-- | kotlin/common.bzl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kotlin/common.bzl b/kotlin/common.bzl index 2279596..07466f7 100644 --- a/kotlin/common.bzl +++ b/kotlin/common.bzl @@ -691,14 +691,6 @@ def _kt_jvm_library( annotation_processor_additional_inputs = annotation_processor_additional_inputs, ) - # Directly return the JavaInfo from java.compile() for java-only android_library targets - # to avoid creating a new JavaInfo. See b/239847857 for additional context. - if is_android_library_without_kt_srcs_without_generative_deps: - return struct( - java_info = javac_java_info, - validations = [], - ) - out_jars.append(javac_out) out_srcjars.extend(javac_java_info.source_jars) out_compilejars.extend(javac_java_info.compile_jars.to_list()) # unpack singleton depset @@ -763,10 +755,18 @@ def _kt_jvm_library( extra_input_depsets = [p.processor_data for p in java_plugin_datas], testonly = testonly, android_java8_libs = kt_toolchain.android_java8_apis_desugared, - mnemonic = "KtAndroidLint", # so LSA extractor can distinguish Kotlin (b/189442586) + mnemonic = "AndroidLint" if is_android_library_without_kt_srcs else "KtAndroidLint", # so LSA extractor can distinguish Kotlin (b/189442586) ) blocking_action_outs.append(android_lint_out) + # Directly return the JavaInfo from java.compile() for java-only android_library targets + # to avoid creating a new JavaInfo. See b/239847857 for additional context. + if javac_java_info and is_android_library_without_kt_srcs_without_generative_deps: + return struct( + java_info = javac_java_info, + validations = blocking_action_outs, + ) + if output_srcjar == None: output_srcjar = file_factory.declare_file("-src.jar") compile_jar = file_factory.declare_file("-compile.jar") |