diff options
| author |  Googler <noreply@google.com> | 2016-12-08 19:31:45 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2016-12-09 15:31:35 +0000 |
| commit | 38edc5dc9d1fd58ffcb3223a1c194e04eb066437 (patch) | |
| tree | 76354bf78ae23fc4513f6d9dfe6f8e0835670ea3 /src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java | |
| parent | 4d5dc970a9b2616b9c5eb260d089be7c4f17c582 (diff) | |
Fix ProGuard multipass seed printing
When running ProGuard in multiple phases, Bazel was picking up an
erroneous 0-byte seeds artifact. ProGuard only generates a seeds
artifact during NORMAL and INITIAL runtypes.
--
PiperOrigin-RevId: 141463120
MOS_MIGRATED_REVID=141463120
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 3cc7776f3c..5c88b75001 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 @@ -403,7 +403,7 @@ public abstract class ProguardHelper { output.getOutputJar(), /* proguardOutputMap */ null, /* proguardOutputProtoMap */ null, - /* proguardSeeds */ null, + output.getSeeds(), // ProGuard only prints seeds during INITIAL and NORMAL runtypes. /* proguardUsage */ null, /* constantStringObfuscatedMapping */ null, /* proguardConfigOutput */ null) @@ -449,7 +449,7 @@ public abstract class ProguardHelper { output.getOutputJar(), output.getMapping(), output.getProtoMapping(), - output.getSeeds(), + /* proguardSeeds */ null, // runtype FINAL does not produce seeds. output.getUsage(), output.getConstantStringObfuscatedMapping(), output.getConfig()) |