Remove MergeeManifestsConverter used for the transition of --mergeeManifests from a list of paths to a dictionary of paths and manifest names.

--
MOS_MIGRATED_REVID=129987988

2 files changed, 2 insertions, 30 deletions

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 464e793872..7afc60b229 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
@@ -387,30 +387,4 @@ public final class Converters {
       return super.convert(input);
     }
   }
-
-  /**
-   * A converter to handle the migration of the --mergeeManifests flag from a list of paths to a
-   * dictionary of paths to labels.
-   */
-  public static class MergeeManifestsConverter implements Converter<Map<Path, String>> {
-    @Override
-    public Map<Path, String> convert(String input) throws OptionsParsingException {
-      try {
-        List<Path> manifests = new ExistingPathListConverter().convert(input);
-        Map<Path, String> mergeeManifests = new LinkedHashMap<>();
-        for (Path manifest : manifests) {
-          mergeeManifests.put(manifest, manifest.getFileName().toString());
-        }
-        return ImmutableMap.copyOf(mergeeManifests);
-      } catch (OptionsParsingException e) {
-        // Expected if argument change has been released.
-        return new ExistingPathStringDictionaryConverter().convert(input);
-      }
-    }
-
-    @Override
-    public String getTypeDescription() {
-      return "a path to string dictionary with fallback to path list using filename as values";
-    }
-  }
 }
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 f12fb17293..520966bd53 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
@@ -17,7 +17,7 @@ import static java.util.logging.Level.SEVERE;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.android.Converters.ExistingPathConverter;
-import com.google.devtools.build.android.Converters.MergeeManifestsConverter;
+import com.google.devtools.build.android.Converters.ExistingPathStringDictionaryConverter;
 import com.google.devtools.build.android.Converters.MergeTypeConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.Converters.StringDictionaryConverter;
@@ -78,9 +78,7 @@ public class ManifestMergerAction {
 
     @Option(name = "mergeeManifests",
         defaultValue = "",
-        // TODO(apell): switch to ExistingPathStringDictionaryConverter.class after argument change
-        // has been released.
-        converter = MergeeManifestsConverter.class,
+        converter = ExistingPathStringDictionaryConverter.class,
         category = "input",
         help = "A dictionary of manifests, and originating target, to be merged into manifest.")
     public Map<Path, String> mergeeManifests;