Remove some deprecated resources flags.

RELNOTES: None
PiperOrigin-RevId: 191624839

7 files changed, 5 insertions, 119 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
index 69ad4a5e12..79a1e78ba3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
@@ -63,8 +63,6 @@ public class Aapt2ResourceShrinkingAction {
     optionsParser.parseAndExitUponError(args);
     Aapt2ConfigOptions aapt2ConfigOptions = optionsParser.getOptions(Aapt2ConfigOptions.class);
     Options options = optionsParser.getOptions(Options.class);
-    options.dependencyManifests =
-        Converters.concatLists(options.dependencyManifests, options.deprecatedDependencyManifests);
     profiler.recordEndOf("flags").startTask("setup");
 
     final ListeningExecutorService executorService = ExecutorServiceCloser.createDefaultService();
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index 6f458ae044..f995a7a370 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -545,7 +545,7 @@ public class AndroidResourceProcessor {
   }
 
   public ResourceSymbols loadResourceSymbolTable(
-      Iterable<SymbolFileProvider> libraries,
+      Iterable<? extends SymbolFileProvider> libraries,
       String appPackageName,
       Path primaryRTxt,
       Multimap<String, ResourceSymbols> libMap)
diff --git a/src/tools/android/java/com/google/devtools/build/android/Converters.java b/src/tools/android/java/com/google/devtools/build/android/Converters.java
index e58dd2d29b..13911f973e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Converters.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Converters.java
@@ -21,7 +21,6 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.android.aapt2.CompiledResources;
 import com.google.devtools.build.android.aapt2.StaticLibrary;
 import com.google.devtools.common.options.Converter;
@@ -40,7 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 
 /**
  * Some convenient converters used by android actions. Note: These are specific to android actions.
@@ -206,42 +204,6 @@ public final class Converters {
   }
 
   /**
-   * Converter for a list of {@link DependencySymbolFileProvider}. Relies on {@code
-   * DependencySymbolFileProvider#valueOf(String)} to perform conversion and validation.
-   *
-   * @deprecated use multi-value flags and {@link DependencySymbolFileProviderConverter} instead.
-   */
-  @Deprecated
-  public static class DependencySymbolFileProviderListConverter
-      implements Converter<List<DependencySymbolFileProvider>> {
-
-    @Override
-    public List<DependencySymbolFileProvider> convert(String input) throws OptionsParsingException {
-      if (input.isEmpty()) {
-        return ImmutableList.<DependencySymbolFileProvider>of();
-      }
-      try {
-        ImmutableList.Builder<DependencySymbolFileProvider> builder = ImmutableList.builder();
-        for (String item : input.split(",")) {
-          builder.add(DependencySymbolFileProvider.valueOf(item));
-        }
-        return builder.build();
-      } catch (IllegalArgumentException e) {
-        throw new OptionsParsingException(
-            String.format("invalid DependencyAndroidData: %s", e.getMessage()), e);
-      }
-    }
-
-    @Override
-    public String getTypeDescription() {
-      return String.format(
-          "a list of dependency android data in the format: %s[%s]",
-          DependencySymbolFileProvider.commandlineFormat("1"),
-          DependencySymbolFileProvider.commandlineFormat("2"));
-    }
-  }
-
-  /**
    * Converter for {@link Revision}. Relies on {@code Revision#parseRevision(String)} to perform
    * conversion and validation.
    */
@@ -319,18 +281,6 @@ public final class Converters {
     }
   }
 
-  public static <T> List<T> concatLists(
-      @Nullable List<? extends T> a, @Nullable List<? extends T> b) {
-    @SuppressWarnings("unchecked")
-    List<T> la = (List<T>) a;
-    @SuppressWarnings("unchecked")
-    List<T> lb = (List<T>) b;
-    if (la == null || la.isEmpty()) {
-      return (lb == null || lb.isEmpty()) ? ImmutableList.of() : lb;
-    }
-    return (lb == null || lb.isEmpty()) ? la : ImmutableList.copyOf(Iterables.concat(la, lb));
-  }
-
   /**
    * Validating converter for a list of Paths. A Path is considered valid if it resolves to a file.
    */
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 73a6c368e8..fdacd1f3fe 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
@@ -18,11 +18,9 @@ import com.google.common.base.Strings;
 import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import com.google.devtools.build.android.AndroidResourceProcessor.AaptConfigOptions;
 import com.google.devtools.build.android.Converters.PathConverter;
-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 com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
@@ -81,22 +79,6 @@ public class LibraryRClassGeneratorAction {
     )
     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;
-
     @Option(
       name = "targetLabel",
       defaultValue = "null",
@@ -127,7 +109,6 @@ public class LibraryRClassGeneratorAction {
     optionsParser.parseAndExitUponError(args);
     AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
     Options options = optionsParser.getOptions(Options.class);
-    options.symbols = Converters.concatLists(options.symbols, options.deprecatedSymbols);
     logger.fine(
         String.format("Option parsing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     try (ScopedTemporaryDirectory scopedTmp =
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 9213149e5b..ff3256d6ae 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
@@ -14,20 +14,17 @@
 package com.google.devtools.build.android;
 
 import com.android.builder.core.VariantConfiguration;
-import com.android.builder.dependency.SymbolFileProvider;
 import com.android.utils.StdLogger;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.devtools.build.android.Converters.DependencySymbolFileProviderConverter;
-import com.google.devtools.build.android.Converters.DependencySymbolFileProviderListConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.resources.ResourceSymbols;
 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 com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
@@ -109,24 +106,6 @@ public class RClassGeneratorAction {
     )
     public List<DependencySymbolFileProvider> libraries;
 
-    // TODO(laszlocsomor): remove this flag after 2018-02-28 (about 6 months from now). Everyone
-    // should have updated to newer Bazel versions by then.
-    @Deprecated
-    @Option(
-      name = "libraries",
-      defaultValue = "",
-      deprecationWarning = "Deprecated in favour of \"--library\"",
-      converter = DependencySymbolFileProviderListConverter.class,
-      category = "input",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help =
-          "R.txt and manifests for the libraries in this binary's deps. We will write "
-              + "class files for the libraries as well. Expected format: lib1/R.txt[:lib2/R.txt]",
-      metadataTags = {OptionMetadataTag.DEPRECATED}
-    )
-    public List<DependencySymbolFileProvider> deprecatedLibraries;
-
     @Option(
       name = "classJarOutput",
       defaultValue = "null",
@@ -174,8 +153,6 @@ public class RClassGeneratorAction {
       Path classOutPath = tmp.resolve("compiled_classes");
 
       logger.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-      List<SymbolFileProvider> libraries =
-          Converters.concatLists(options.libraries, options.deprecatedLibraries);
       // Note that we need to write the R class for the main binary (so proceed even if there
       // are no libraries).
       if (options.primaryRTxt != null) {
@@ -187,7 +164,7 @@ public class RClassGeneratorAction {
         Multimap<String, ResourceSymbols> libSymbolMap = ArrayListMultimap.create();
         ResourceSymbols fullSymbolValues =
             resourceProcessor.loadResourceSymbolTable(
-                libraries, appPackageName, options.primaryRTxt, libSymbolMap);
+                options.libraries, appPackageName, options.primaryRTxt, libSymbolMap);
         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.
@@ -195,10 +172,10 @@ public class RClassGeneratorAction {
             libSymbolMap, appPackageName, classOutPath, true /* finalFields */);
         logger.fine(
             String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-      } else if (!libraries.isEmpty()) {
+      } else if (!options.libraries.isEmpty()) {
         Multimap<String, ResourceSymbols> libSymbolMap = ArrayListMultimap.create();
         ResourceSymbols fullSymbolValues =
-            resourceProcessor.loadResourceSymbolTable(libraries, null, null, libSymbolMap);
+            resourceProcessor.loadResourceSymbolTable(options.libraries, null, null, libSymbolMap);
         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.
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
index 9f774fc679..57193f0f7f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
@@ -26,13 +26,11 @@ import com.google.devtools.build.android.AndroidResourceProcessor.AaptConfigOpti
 import com.google.devtools.build.android.AndroidResourceProcessor.FlagAaptOptions;
 import com.google.devtools.build.android.Converters.ExistingPathConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
-import com.google.devtools.build.android.Converters.PathListConverter;
 import com.google.devtools.build.android.Converters.VariantTypeConverter;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 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 com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
@@ -143,22 +141,6 @@ public class ResourceShrinkerAction {
     )
     public List<Path> dependencyManifests;
 
-    // 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 = "dependencyManifests",
-      defaultValue = "",
-      category = "input",
-      converter = PathListConverter.class,
-      deprecationWarning = "Deprecated in favour of \"--dependencyManifest\"",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help = "A list of paths to the manifests of the dependencies.",
-      metadataTags = {OptionMetadataTag.DEPRECATED}
-    )
-    public List<Path> deprecatedDependencyManifests;
-
     @Option(
       name = "resourcePackages",
       defaultValue = "",
@@ -257,8 +239,6 @@ public class ResourceShrinkerAction {
     optionsParser.parseAndExitUponError(args);
     aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
     options = optionsParser.getOptions(Options.class);
-    options.dependencyManifests =
-        Converters.concatLists(options.dependencyManifests, options.deprecatedDependencyManifests);
 
     AndroidResourceProcessor resourceProcessor = new AndroidResourceProcessor(stdLogger);
     // Setup temporary working directories.
diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
index 29ca09281a..10f87902cb 100644
--- a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
+++ b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java
@@ -125,7 +125,7 @@ public class ResourceSymbols {
    * @throws InterruptedException when there is an error loading the symbols.
    */
   public static Multimap<String, ListenableFuture<ResourceSymbols>> loadFrom(
-      Iterable<SymbolFileProvider> dependencies,
+      Iterable<? extends SymbolFileProvider> dependencies,
       ListeningExecutorService executor,
       @Nullable String packageToExclude)
       throws InterruptedException, ExecutionException {