Add parameter files to the android resource processing.

--
PiperOrigin-RevId: 145686107
MOS_MIGRATED_REVID=145686107

1 files changed, 8 insertions, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
index 76e8496221..18baf65393 100644
--- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
@@ -27,6 +27,7 @@ import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -57,7 +58,7 @@ public class RClassGeneratorAction {
   private static final StdLogger STD_LOGGER =
       new StdLogger(StdLogger.Level.WARNING);
 
-  private static final Logger LOGGER = Logger.getLogger(RClassGeneratorAction.class.getName());
+  private static final Logger logger = Logger.getLogger(RClassGeneratorAction.class.getName());
 
   /**
    * Flag specifications for this action.
@@ -104,6 +105,7 @@ public class RClassGeneratorAction {
   public static void main(String[] args) throws Exception {
     final Stopwatch timer = Stopwatch.createStarted();
     OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
+    optionsParser.enableParamsFileSupport(FileSystems.getDefault());
     if (args.length == 1 && args[0].startsWith("@")) {
       args = Files.readAllLines(Paths.get(args[0].substring(1)), StandardCharsets.UTF_8)
           .toArray(new String[0]);
@@ -118,7 +120,7 @@ public class RClassGeneratorAction {
       Path tmp = scopedTmp.getPath();
       Path classOutPath = tmp.resolve("compiled_classes");
 
-      LOGGER.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
+      logger.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
       List<SymbolFileProvider> libraries = new ArrayList<>();
       for (DependencySymbolFileProvider library : options.libraries) {
         libraries.add(library);
@@ -134,13 +136,13 @@ public class RClassGeneratorAction {
         Multimap<String, SymbolLoader> libSymbolMap = ArrayListMultimap.create();
         SymbolLoader fullSymbolValues = resourceProcessor.loadResourceSymbolTable(
             libraries, appPackageName, options.primaryRTxt, libSymbolMap);
-        LOGGER.fine(
+        logger.fine(
             String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         // For now, assuming not used for libraries and setting final access for fields.
         if (fullSymbolValues != null) {
           resourceProcessor.writePackageRClasses(libSymbolMap, fullSymbolValues, appPackageName,
               classOutPath, true /* finalFields */);
-          LOGGER.fine(
+          logger.fine(
               String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         }
       } else {
@@ -149,11 +151,11 @@ public class RClassGeneratorAction {
       // We write .class files to temp, then jar them up after (we create a dummy jar, even if
       // there are no class files).
       resourceProcessor.createClassJar(classOutPath, options.classJarOutput);
-      LOGGER.fine(
+      logger.fine(
           String.format("createClassJar finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     } finally {
       resourceProcessor.shutdown();
     }
-    LOGGER.fine(String.format("Compile action done in %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
+    logger.fine(String.format("Compile action done in %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
   }
 }