From f84654f4c88fd87a97ecbde885496b0d2db6a1cf Mon Sep 17 00:00:00 2001 From: kmb Date: Fri, 9 Feb 2018 17:57:15 -0800 Subject: Delete erroneous piece of desugar's renaming logic RELNOTES: None. PiperOrigin-RevId: 185218745 GitOrigin-RevId: c3c5d9bc0e52362bf37129099ba3af1b06229501 Change-Id: I0f277a39360f1de651dd81f2af8490cb5ca695a8 --- .../devtools/build/android/desugar/CorePackageRenamer.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java b/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java index 3d58ef6..5f1dc2e 100644 --- a/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java +++ b/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java @@ -14,12 +14,11 @@ package com.google.devtools.build.android.desugar; import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Handle; import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.Remapper; /** - * A visitor that renames some type names and only when the owner is also renamed. + * A visitor that renames packages so configured using {@link CoreLibrarySupport}.. */ class CorePackageRenamer extends ClassRemapper { @@ -42,13 +41,5 @@ class CorePackageRenamer extends ClassRemapper { public String map(String typeName) { return isRenamed(typeName) ? support.renameCoreLibrary(typeName) : typeName; } - - @Override - public Object mapValue(Object value) { - if (value instanceof Handle && !isRenamed(((Handle) value).getOwner())) { - return value; - } - return super.mapValue(value); - } } } -- cgit v1.2.3