Automated rollback of commit 01ddfb7bf418b371859de62f4eab2f41ea9a4a4a.

This is a partial rollback.
I restored the old flags (with PathListConverter),
added the new ones, added deprecation warnings and
annotations, and added code to concat the values
of new and old.

Existing released versions of Bazel should keep
working with the new code until 2018-01-31, i.e.
for the next ~6 months. After that I'll remove the
old flags and the PathListConverter.

*** Reason for rollback ***

Fixed broken integration with release Blaze.

*** Original change description ***

Automated rollback of commit 5752463ece84ebb4fb074888cba57412ab8d86b3.

*** Reason for rollback ***

Broke too many targets.

***

RELNOTES: none
PiperOrigin-RevId: 162587548

1 files changed, 21 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
index ec41103b08..9709583dda 100644
--- a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
@@ -22,6 +22,7 @@ import com.google.devtools.build.android.Converters.PathListConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
+import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import java.io.IOException;
@@ -68,15 +69,32 @@ public class LibraryRClassGeneratorAction {
     public String packageForR;
 
     @Option(
-      name = "symbols",
+      name = "symbol",
+      allowMultiple = true,
       defaultValue = "",
-      converter = PathListConverter.class,
+      converter = PathConverter.class,
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       category = "config",
       help = "Parsed symbol binaries to write as R classes."
     )
     public List<Path> symbols;
+
+    // TODO(laszlocsomor): remove this flag after 2018-01-31 (about 6 months from now). Everyone
+    // should have updated to newer Bazel versions by then.
+    @Deprecated
+    @Option(
+      name = "symbols",
+      defaultValue = "",
+      converter = PathListConverter.class,
+      deprecationWarning = "Deprecated in favour of \"--symbol\"",
+      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+      effectTags = {OptionEffectTag.UNKNOWN},
+      category = "config",
+      help = "Parsed symbol binaries to write as R classes.",
+      metadataTags = {OptionMetadataTag.DEPRECATED}
+    )
+    public List<Path> deprecatedSymbols;
   }
 
   public static void main(String[] args) throws Exception {
@@ -87,6 +105,7 @@ public class LibraryRClassGeneratorAction {
     optionsParser.parseAndExitUponError(args);
     AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
     Options options = optionsParser.getOptions(Options.class);
+    options.symbols = PathListConverter.concatLists(options.symbols, options.deprecatedSymbols);
     logger.fine(
         String.format("Option parsing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     try (ScopedTemporaryDirectory scopedTmp =