commit 7fe4e8e45db7bea1565d6082a9df8c46999d8b5d
author Googler <noreply@google.com> Tue Mar 31 13:23:26 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 31 13:24:43 2020 -0700
tree 2edab98ca11de596206c53abe669260db32c5a43
parent aebd3c0fda0a2038246ebd5c9a39e9dc4c370981

Add ImmutableLabelRemover to match other ShadowedApiInvocationSite visitors

- In addtional to the existing matching at createClassVisitorsForClassesInInputs method

PiperOrigin-RevId: 304033326

src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
index 3b91d00..d70d5b5 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
@@ -847,6 +847,7 @@
       // Don't need a ClassReaderFactory b/c static interface methods should've been moved.
       ClassVisitor visitor = writer;
       if (coreLibrarySupport != null) {
+        visitor = new ImmutableLabelRemover(visitor);
         visitor = new EmulatedInterfaceRewriter(visitor, coreLibrarySupport);
         visitor = new CorePackageRenamer(visitor, coreLibrarySupport);
         visitor = new CoreLibraryInvocationRewriter(visitor, coreLibrarySupport);
@@ -921,6 +922,7 @@
     ClassVisitor visitor = checkNotNull(writer);
 
     if (coreLibrarySupport != null) {
+      visitor = new ImmutableLabelRemover(visitor);
       visitor = new EmulatedInterfaceRewriter(visitor, coreLibrarySupport);
       visitor = new CorePackageRenamer(visitor, coreLibrarySupport);
       visitor = new CoreLibraryInvocationRewriter(visitor, coreLibrarySupport);