Skip to content

Commit d067f7e

Browse files
committed
Check R8 usage before grabbing proguard outputs from ctx.outputs
Fixes #343 stacked-branch: fix-proguard-outputs
1 parent 59d7db6 commit d067f7e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rules/android_binary/impl.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ def _process_optimize(ctx, validation_ctx, deploy_ctx, packaged_resources_ctx, b
787787
# Proguard map from shrinking is the final output.
788788
proguard_output_map = ctx.actions.declare_file(ctx.label.name + "_proguard.map")
789789

790-
if ctx.attr._generate_proguard_outputs:
790+
if not acls.use_r8(str(ctx.label)) and ctx.attr._generate_proguard_outputs:
791791
proguard_output_jar = ctx.outputs.proguard_jar
792792
proguard_output_config = ctx.outputs.proguard_config
793793
else:

0 commit comments

Comments
 (0)