From bfa35dd2f753e626b3731e5f105d65ec971ed8dc Mon Sep 17 00:00:00 2001
From: lberki <lberki@google.com>
Date: Thu, 24 Aug 2017 12:56:05 +0200
Subject: 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
---
 .../java/com/google/devtools/build/android/ManifestMergerAction.java    | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/tools/android/java')

diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
index 43ef880af8..5f0681e8df 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
@@ -29,7 +29,6 @@ import com.google.devtools.common.options.OptionEffectTag;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import java.io.IOException;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -185,7 +184,6 @@ public class ManifestMergerAction {
 
   public static void main(String[] args) throws Exception {
     OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
-    optionsParser.enableParamsFileSupport(FileSystems.getDefault());
     optionsParser.parseAndExitUponError(args);
     options = optionsParser.getOptions(Options.class);
 
-- 
cgit v1.2.3