Delete some dead android rules and tools code.

--
PiperOrigin-RevId: 143823562
MOS_MIGRATED_REVID=143823562

9 files changed, 3 insertions, 48 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
index 3edab88be1..a001fa96bb 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
@@ -77,11 +77,6 @@ public class BazelAndroidSemantics implements AndroidSemantics {
   }
 
   @Override
-  public ImmutableList<String> getDxJvmArguments() {
-    return ImmutableList.of();
-  }
-
-  @Override
   public void addMainDexListActionArguments(RuleContext ruleContext, SpawnAction.Builder builder) {
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index f43fa830e4..f2f9fc950d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -755,7 +755,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     if (proguardOutput.getMapping() != null) {
       builder.add(
           ProguardMappingProvider.class,
-          ProguardMappingProvider.create(finalProguardMap, proguardOutput.getProtoMapping()));
+          ProguardMappingProvider.create(finalProguardMap));
     }
 
     return builder
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 2b483800f9..7045816c7d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -850,7 +850,6 @@ public class AndroidCommon {
             builder.add(input);
           }
         }
-        continue;
       }
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 6943e95cce..f921fe2684 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -88,8 +88,6 @@ public final class AndroidRuleClasses {
       fromTemplates("%{name}_resources.jar");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_APK =
       fromTemplates("%{name}.ap_");
-  public static final SafeImplicitOutputsFunction ANDROID_BINARY_SHRUNK_JAR =
-      fromTemplates("%{name}_shrunk.jar");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_SHRUNK_APK =
       fromTemplates("%{name}_shrunk.ap_");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_ZIP =
@@ -106,8 +104,6 @@ public final class AndroidRuleClasses {
       fromTemplates("%{name}_incremental.apk");
   public static final SafeImplicitOutputsFunction ANDROID_BINARY_UNSIGNED_APK =
       fromTemplates("%{name}_unsigned.apk");
-  public static final SafeImplicitOutputsFunction ANDROID_BINARY_SIGNED_APK =
-      fromTemplates("%{name}_signed.apk");
   public static final SafeImplicitOutputsFunction ANDROID_BINARY_DEPLOY_JAR =
       fromTemplates("%{name}_deploy.jar");
   public static final SafeImplicitOutputsFunction ANDROID_BINARY_PROGUARD_JAR =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
index 1eba6a3e8c..c433715bfa 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
@@ -86,11 +86,6 @@ public interface AndroidSemantics {
   ImmutableList<String> getJavacArguments(RuleContext ruleContext);
 
   /**
-   * JVM arguments to be passed to the command line of dx.
-   */
-  ImmutableList<String> getDxJvmArguments();
-
-  /**
    * Configures the builder for generating the output jar used to configure the main dex file.
    * @throws InterruptedException
    */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
index 63a9f246f9..f767c40aac 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
@@ -23,14 +23,11 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 @Immutable
 public abstract class ProguardMappingProvider implements TransitiveInfoProvider {
 
-  public static ProguardMappingProvider create(
-      Artifact proguardMapping, Artifact proguardProtoMapping) {
-    return new AutoValue_ProguardMappingProvider(proguardMapping, proguardProtoMapping);
+  public static ProguardMappingProvider create(Artifact proguardMapping) {
+    return new AutoValue_ProguardMappingProvider(proguardMapping);
   }
 
   public abstract Artifact getProguardMapping();
 
-  public abstract Artifact getProguardProtoMapping();
-
   ProguardMappingProvider() {}
 }
diff --git a/src/test/java/com/google/devtools/build/android/ConvertersTest.java b/src/test/java/com/google/devtools/build/android/ConvertersTest.java
index 83bbe66677..92c9cf2f22 100644
--- a/src/test/java/com/google/devtools/build/android/ConvertersTest.java
+++ b/src/test/java/com/google/devtools/build/android/ConvertersTest.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.android.Converters.ExistingPathListConverter;
 import com.google.devtools.build.android.Converters.ExistingPathStringDictionaryConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.Converters.PathListConverter;
-import com.google.devtools.build.android.Converters.PathStringDictionaryConverter;
 import com.google.devtools.build.android.Converters.StringDictionaryConverter;
 import com.google.devtools.common.options.OptionsParsingException;
 import java.io.File;
@@ -156,13 +155,6 @@ public final class ConvertersTest {
   }
 
   @Test
-  public void testPathStringDictionaryConverter() throws Exception {
-    PathStringDictionaryConverter converter = new PathStringDictionaryConverter();
-    Map<Path, String> result = converter.convert("test_file:string");
-    assertThat(result).containsExactly(Paths.get("test_file"), "string");
-  }
-
-  @Test
   public void testExistingPathStringDictionaryConverter() throws Exception {
     Path existingFile = tmp.newFile("existing").toPath();
     ExistingPathStringDictionaryConverter converter = new ExistingPathStringDictionaryConverter();
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
index 92e674cb43..36374e4369 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
@@ -126,8 +126,6 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
       };
 
   private final Path destination;
-  private final Map<String, Map<FullyQualifiedName, Iterable<String>>> valueFragments =
-      new HashMap<>();
 
   private final Map<String, ResourceValuesDefinitions> valueTags = new HashMap<>();
   private final Path resourceDirectory;
@@ -246,7 +244,6 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
         .aggregateAndMaybeThrow(writeTasks);
 
     writeTasks.clear();
-    valueFragments.clear();
   }
 
   @Override
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 8bd6a20cac..63f59801aa 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
@@ -417,22 +417,6 @@ public final class Converters {
    * may contain colons and commas as long as they are escaped with a backslash. The key type is
    * Path and the value type is String.
    */
-  public static class PathStringDictionaryConverter extends DictionaryConverter<Path, String> {
-    public PathStringDictionaryConverter() {
-      super(new PathConverter(), IDENTITY_CONVERTER);
-    }
-    // The way {@link OptionsData} checks for generic types requires convert to have literal type
-    // parameters and not argument type parameters.
-    @Override public Map<Path, String> convert(String input) throws OptionsParsingException {
-      return super.convert(input);
-    }
-  }
-
-  /**
-   * A converter for dictionary arguments of the format key:value[,key:value]*. The keys and values
-   * may contain colons and commas as long as they are escaped with a backslash. The key type is
-   * Path and the value type is String.
-   */
   public static class ExistingPathStringDictionaryConverter
       extends DictionaryConverter<Path, String> {
     public ExistingPathStringDictionaryConverter() {