Skip to content

Commit 81c6b35

Browse files
Travis-Metafacebook-github-bot
authored andcommitted
Hoist skip_proguard flag so it can be provided by the caller
Summary: This was the last property I had to hoist before making proguard run in the java_binary rule. While this isn't android-specific, it's not part of the java_binary rule properties, and the value of it does seem to be android-specific. We can always provide it via java_binary later if we need it there as well, since now it's just passed in rather than fetched from a context. Reviewed By: hick209 Differential Revision: D72092338 fbshipit-source-id: 99ef3e5f5c3b5410f9d5acf9367f371d9f925a0b
1 parent 42b2457 commit 81c6b35

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

prelude/android/android_binary.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ def get_binary_info(ctx: AnalysisContext, use_proto_format: bool) -> AndroidBina
150150
ctx.attrs.android_sdk_proguard_config,
151151
android_toolchain.proguard_config,
152152
android_toolchain.optimized_proguard_config,
153+
ctx.attrs.skip_proguard,
153154
)
154155
materialized_artifacts.extend(proguard_output.proguard_artifacts)
155156
jars_to_owners = proguard_output.jars_to_owners

prelude/java/proguard.bzl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,14 @@ def get_proguard_output(
137137
additional_jars: list[Artifact],
138138
sdk_proguard_config_mode: str | None,
139139
sdk_proguard_config: Artifact | None,
140-
sdk_optimized_proguard_config: Artifact | None) -> ProguardOutput:
140+
sdk_optimized_proguard_config: Artifact | None,
141+
skip_proguard: bool = False) -> ProguardOutput:
141142
proguard_configs = [packaging_dep.proguard_config for packaging_dep in java_packaging_deps if packaging_dep.proguard_config]
142143
if ctx.attrs.proguard_config:
143144
proguard_configs.append(ctx.attrs.proguard_config)
144145
proguard_configs.extend(additional_proguard_configs)
145146

146-
if ctx.attrs.skip_proguard:
147+
if skip_proguard:
147148
input_jars_to_output_jars = {input_jar: input_jar for input_jar in input_jars.keys()}
148149
mapping = ctx.actions.write("proguard/mapping.txt", [])
149150
configuration = None
@@ -174,7 +175,7 @@ def get_proguard_output(
174175

175176
command_line_args_file = ctx.actions.write("proguard/command-line.txt", command_line_args)
176177

177-
if ctx.attrs.skip_proguard:
178+
if skip_proguard:
178179
return ProguardOutput(
179180
jars_to_owners = input_jars,
180181
proguard_configuration_output_file = None,

0 commit comments

Comments
 (0)