Skip to content

Commit 6d85a0c

Browse files
ajsinclaircopybara-github
authored andcommitted
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
1 parent b98dadf commit 6d85a0c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mobile_install/adapters/desugar.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ visibility(PROJECT_VISIBILITY)
2020

2121
def get_desugar_classpath(java_info):
2222
if acls.in_desugaring_runtime_jar_classpath_rollout():
23-
return java_info.transitive_runtime_jars
23+
return java_info._transitive_full_compile_time_jars
2424
return java_info.transitive_compile_time_jars

rules/dex_desugar_aspect.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def get_aspect_deps(ctx):
8282

8383
def _get_desugar_classpath(java_info):
8484
if acls.in_desugaring_runtime_jar_classpath_rollout():
85-
return java_info.transitive_runtime_jars
85+
return java_info._transitive_full_compile_time_jars
8686
return java_info.transitive_compile_time_jars
8787

8888
def _aspect_impl(target, ctx):

0 commit comments

Comments
 (0)