From 2aa5142dbc0b8bf8981ad6d5038895ff203e2d6f Mon Sep 17 00:00:00 2001
From: ajmichael <ajmichael@google.com>
Date: Wed, 4 Apr 2018 11:54:28 -0700
Subject: Remove some deprecated resources flags.

RELNOTES: None
PiperOrigin-RevId: 191624839
GitOrigin-RevId: c4987159509cd8de3f0c4070b53ea1bf3b8278cd
Change-Id: Iaf2947340b544491d975d64d19b5337be25a9ac6
---
 .../google/devtools/build/android/Converters.java  | 50 ----------------------
 1 file changed, 50 deletions(-)

diff --git a/java/com/google/devtools/build/android/Converters.java b/java/com/google/devtools/build/android/Converters.java
index e58dd2d..13911f9 100644
--- a/java/com/google/devtools/build/android/Converters.java
+++ b/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.
@@ -205,42 +203,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.
    */
-- 
cgit v1.2.3