diff options
| author |  lberki <lberki@google.com> | 2017-08-24 12:56:05 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-24 14:00:19 +0200 |
| commit | bfa35dd2f753e626b3731e5f105d65ec971ed8dc (patch) | |
| tree | 63261f6afdb1e1a4820bb1642da2806df95d61eb /src/main/java | |
| parent | a7c54727065b1dfff94089d9865bbe79c5085349 (diff) | |
Automated rollback of commit d31a944cfae27564caa7f974e0daec99314d4c44.
*** Reason for rollback ***
Breaks //java/com/google/commerce/tapandpay/android/app/alienfood:<things>
*** Original change description ***
Enable parameter files for manifest merger actions.
RELNOTES: None.
PiperOrigin-RevId: 166324224
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java index c4049d59f0..0f0c682ffb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java @@ -140,9 +140,7 @@ public class ManifestMergerActionBuilder { // list-type and list-of-list-type flags that use such problematic separators in favor of // multi-value flags (to remove one level of listing) and by changing all list separators to a // platform-safe character (= comma). - spawnActionBuilder.alwaysUseParameterFile(ParameterFileType.UNQUOTED); - } else { - spawnActionBuilder.useParameterFile(ParameterFileType.UNQUOTED); + this.spawnActionBuilder.alwaysUseParameterFile(ParameterFileType.UNQUOTED); } ruleContext.registerAction( |