From 50959b2552a7aea11f4ae2be5c33087230c11b37 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 21 Mar 2016 18:43:32 +0000 Subject: Add -forceprocessing to cause proguard to skip the step where it checks if the outputs are up-to date as blaze does this for us. RELNOTES: ProGuard relies on bazel to check to see if the inputs have changed. -- MOS_MIGRATED_REVID=117736709 --- .../java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 2 ++ .../java/com/google/devtools/build/lib/rules/java/ProguardHelper.java | 1 + 2 files changed, 3 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib') 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 5b953c5845..5db6cf187e 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 @@ -897,6 +897,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { builder.addArgument("-ignorewarnings") .addArgument("-dontnote") + .addArgument("-forceprocessing") .addArgument("-dontoptimize") .addArgument("-dontobfuscate") .addArgument("-dontpreverify") @@ -1196,6 +1197,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { .setExecutable(sdk.getProguard()) .setProgressMessage("Generating streamlined input jar for main dex classes list") .setMnemonic("MainDexClassesIntermediate") + .addArgument("-forceprocessing") .addArgument("-injars") .addInputArgument(jar) .addArgument("-libraryjars") diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java index da3058752d..136fc935fd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java @@ -365,6 +365,7 @@ public abstract class ProguardHelper { .addInputs(proguardSpecs) .setExecutable(proguard) .setMnemonic("Proguard") + .addArgument("-forceprocessing") .addArgument("-injars") .addArgument(programJar.getExecPathString()) // This is handled by the build system there is no need for proguard to check if things are -- cgit v1.2.3