commit c6f2eabf1a417f9bf1ee87dff6a5e50d78de12ab
author nickreid <nickreid@google.com> Fri Mar 24 11:19:32 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Mar 24 11:20:08 2023 -0700
tree f121ee5a73502e541f013d69c4827b76aa168dc2
parent 0326e60f898d267a8d2299d114cf0d2d3df43550

Thread lint_actions.AndroidLintRulesetInfo through kt_jvm_compile

PiperOrigin-RevId: 519192950

bazel/stubs.bzl

diff --git a/bazel/stubs.bzl b/bazel/stubs.bzl
index 5d041f4..e49ad4e 100644
--- a/bazel/stubs.bzl
+++ b/bazel/stubs.bzl
@@ -47,7 +47,10 @@
     ctx.actions.write(output, "Android Lint Disabled")
     return output
 
+_AndroidLintRulesetInfo = provider()
+
 lint_actions = struct(
+    AndroidLintRulesetInfo = _AndroidLintRulesetInfo,
     run_lint_on_library = _run_lint_on_library,
     get_android_lint_baseline_file = _empty_fn,
 )

kotlin/jvm_compile.bzl

diff --git a/kotlin/jvm_compile.bzl b/kotlin/jvm_compile.bzl
index 4014645..07d1400 100644
--- a/kotlin/jvm_compile.bzl
+++ b/kotlin/jvm_compile.bzl
@@ -18,6 +18,7 @@
 load(":compiler_plugin.bzl", "KtCompilerPluginInfo")
 load(":traverse_exports.bzl", "kt_traverse_exports")
 load("//:visibility.bzl", "RULES_DEFS_THAT_COMPILE_KOTLIN")
+load("//bazel:stubs.bzl", "lint_actions")
 
 _RULE_FAMILY = common.RULE_FAMILY
 
@@ -166,8 +167,18 @@
         output = output,
         output_srcjar = output_srcjar,
         plugins = common.kt_plugins_map(
-            android_lint_singlejar_plugins = android_lint_rules_jars,
-            android_lint_libjar_plugin_infos = [p[JavaInfo] for p in android_lint_plugins],
+            android_lint_singlejar_plugins = depset(
+                transitive = [android_lint_rules_jars] + [
+                    p[lint_actions.AndroidLintRulesetInfo].singlejars
+                    for p in android_lint_plugins
+                    if (lint_actions.AndroidLintRulesetInfo in p)
+                ],
+            ),
+            android_lint_libjar_plugin_infos = [
+                p[JavaInfo]
+                for p in android_lint_plugins
+                if (JavaInfo in p)
+            ],
             java_plugin_infos = [
                 plugin[JavaPluginInfo]
                 for plugin in plugins

kotlin/jvm_library.internal.bzl

diff --git a/kotlin/jvm_library.internal.bzl b/kotlin/jvm_library.internal.bzl
index 22e6ef1..b7291d8 100644
--- a/kotlin/jvm_library.internal.bzl
+++ b/kotlin/jvm_library.internal.bzl
@@ -19,6 +19,7 @@
 load("//toolchains/kotlin_jvm:java_toolchains.bzl", "java_toolchains")
 load("//toolchains/kotlin_jvm:kt_jvm_toolchains.bzl", "kt_jvm_toolchains")
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
+load("//bazel:stubs.bzl", "lint_actions")
 load(":common.bzl", "common")
 load(":compiler_plugin.bzl", "KtCompilerPluginInfo")
 load(":traverse_exports.bzl", "kt_traverse_exports")
@@ -235,6 +236,7 @@
     _android_lint_plugins = attr.label_list(
         providers = [
             [JavaInfo],
+            [lint_actions.AndroidLintRulesetInfo],
         ],
         cfg = "exec",
     ),