1 files changed, 1 insertions, 19 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java
index 5f1dc2e0f6..050e4bfcc0 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.android.desugar;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.commons.ClassRemapper;
-import org.objectweb.asm.commons.Remapper;
 
 /**
  * A visitor that renames packages so configured using {@link CoreLibrarySupport}..
@@ -23,23 +22,6 @@ import org.objectweb.asm.commons.Remapper;
 class CorePackageRenamer extends ClassRemapper {
 
   public CorePackageRenamer(ClassVisitor cv, CoreLibrarySupport support) {
-    super(cv, new CorePackageRemapper(support));
-  }
-
-  private static final class CorePackageRemapper extends Remapper {
-    private final CoreLibrarySupport support;
-
-    private CorePackageRemapper(CoreLibrarySupport support) {
-      this.support = support;
-    }
-
-    public boolean isRenamed(String owner) {
-      return support.isRenamedCoreLibrary(owner);
-    }
-
-    @Override
-    public String map(String typeName) {
-      return isRenamed(typeName) ? support.renameCoreLibrary(typeName) : typeName;
-    }
+    super(cv, support.getRemapper());
   }
 }