aboutsummaryrefslogtreecommitdiff
path: root/kotlin
diff options
context:
space:
mode:
authorZhaoqing Xu <zhaoqxu@google.com>2022-08-16 16:28:12 -0700
committerCopybara-Service <copybara-worker@google.com>2022-08-16 16:28:39 -0700
commit8cac398f885972e151f3fe36eadf5adeb45e9556 (patch)
tree1254079f8273148400da475c9b7508f9347a99d5 /kotlin
parent60d33bd1df238f77cc8eac97cd9807555011c1d8 (diff)
downloadbazelbuild-kotlin-rules-8cac398f885972e151f3fe36eadf5adeb45e9556.tar.gz
Automated rollback of commit 60d33bd1df238f77cc8eac97cd9807555011c1d8.
PiperOrigin-RevId: 468053929
Diffstat (limited to 'kotlin')
-rw-r--r--kotlin/jvm_compile.bzl5
1 files changed, 2 insertions, 3 deletions
diff --git a/kotlin/jvm_compile.bzl b/kotlin/jvm_compile.bzl
index 24ecab6..e4684c8 100644
--- a/kotlin/jvm_compile.bzl
+++ b/kotlin/jvm_compile.bzl
@@ -110,7 +110,7 @@ def kt_jvm_compile(
use_flogger = False
# Skip deps validation check for any android_library target with no kotlin sources: b/239721906
- has_kt_srcs = any([common.is_kt_src(src) for src in srcs + common_srcs])
+ has_kt_srcs = any([common.is_kt_src(src) for src in srcs])
if rule_family != _RULE_FAMILY.ANDROID_LIBRARY or has_kt_srcs:
kt_traverse_exports.expand_forbidden_deps(deps + runtime_deps + exports)
@@ -122,8 +122,7 @@ def kt_jvm_compile(
else:
fail("Unexpected dependency (must provide JavaInfo): %s" % dep.label)
- if rule_family != _RULE_FAMILY.ANDROID_LIBRARY or has_kt_srcs:
- java_infos.extend(kt_toolchain.kotlin_libs)
+ java_infos.extend(kt_toolchain.kotlin_libs)
# TODO: Inject the runtime library from the flogger API target
if use_flogger: