Use _transitive_full_compile_time_jars instead of transitive_runtime_jars for the desugaring classpath. This handles desugared classes that depend on neverlinked dependencies PiperOrigin-RevId: 736277428 Change-Id: I1b009f28b6946c4084e163597ec0c5f3979dce0c
diff --git a/mobile_install/adapters/desugar.bzl b/mobile_install/adapters/desugar.bzl index 4c3dd3a..74589dc 100644 --- a/mobile_install/adapters/desugar.bzl +++ b/mobile_install/adapters/desugar.bzl
@@ -20,5 +20,5 @@ def get_desugar_classpath(java_info): if acls.in_desugaring_runtime_jar_classpath_rollout(): - return java_info.transitive_runtime_jars + return java_info._transitive_full_compile_time_jars return java_info.transitive_compile_time_jars
diff --git a/rules/dex_desugar_aspect.bzl b/rules/dex_desugar_aspect.bzl index be19e35..012109f 100644 --- a/rules/dex_desugar_aspect.bzl +++ b/rules/dex_desugar_aspect.bzl
@@ -82,7 +82,7 @@ def _get_desugar_classpath(java_info): if acls.in_desugaring_runtime_jar_classpath_rollout(): - return java_info.transitive_runtime_jars + return java_info._transitive_full_compile_time_jars return java_info.transitive_compile_time_jars def _aspect_impl(target, ctx):