add option to provide proguard specs on blaze command line

--
MOS_MIGRATED_REVID=108626077

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 6c89ea7e4c..bdfb683517 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -752,7 +752,11 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     // TODO(kmb): In modes other than LEGACY verify that proguard specs don't include -dont... flags
     // since those flags would override the desired optMode (b/25621573)
     ImmutableSortedSet.Builder<Artifact> builder =
-        ImmutableSortedSet.<Artifact>orderedBy(Artifact.EXEC_PATH_COMPARATOR).addAll(proguardSpecs);
+        ImmutableSortedSet.orderedBy(Artifact.EXEC_PATH_COMPARATOR)
+            .addAll(proguardSpecs)
+            .addAll(ruleContext
+                .getPrerequisiteArtifacts(":extra_proguard_specs", Mode.TARGET)
+                .list());
     for (ProguardSpecProvider dep :
         ruleContext.getPrerequisites("deps", Mode.TARGET, ProguardSpecProvider.class)) {
       builder.addAll(dep.getTransitiveProguardSpecs());