Skip to content

Commit dacec7b

Browse files
mauricioggcopybara-github
authored andcommitted
Merge #499 by mauriciogg: Use short_path instead of path to create filename
Use `short_path` instead of `path` to create filename Using `path` contains platform specific components (e.g. `darwin-arm64-dbg`) which result in different cache key even when `path-mapping` is enabled. This fixes `path-mapping` support for desugar and dex actions Closes #499 COPYBARA_INTEGRATE_REVIEW=#499 from mauriciogg:patch-6 2685b13 PiperOrigin-RevId: 917364556 Change-Id: I1b39cadf0212cfcbb3edefd2dc0b2c4635db397c
1 parent 71ea32a commit dacec7b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

rules/dex_desugar_aspect.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def _aspect_impl(target, ctx):
124124
for jar in runtime_jars:
125125
if ctx.fragments.android.desugar_java8:
126126
jar_to_desugar = jar
127-
unique_desugar_filename = (jar.path if basename_clash else jar.basename) + "_desugared.jar"
127+
unique_desugar_filename = (jar.short_path if basename_clash else jar.basename) + "_desugared.jar"
128128
desugared_jar = _dex.get_dx_artifact(ctx, unique_desugar_filename, min_sdk_version)
129129

130130
# Optionally transform the jar before desugaring

0 commit comments

Comments
 (0)