commit d701506309929f223065396fa0a9bdb13fab4fce
author Googler <noreply@google.com> Tue Mar 31 01:36:56 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 31 01:38:10 2020 -0700
tree d54969549f95895ec6ac322a3f9683df5f6d485c
parent 435194f5b01e43df3cbe092ec075eb83e7fbc046

Keep ImmutableLabelRemover under coreLibrarySupport enabled

- Reason: break //third_party/appreduce/integration_tests/inline_class_name/javatests:AndroidTests
- Investigation:
  Test fails even with no-op naming mapping change. e.g. unknown commit
  It is likely ClassRemapper still modifies the class file with an identical mapping configuration, and AppReduce depends on this semantic-identical but binary-different property. As this feature is for core library desugaring, limit the scope to core library for now.

PiperOrigin-RevId: 303917120

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 21aa352..3b91d00 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
@@ -1015,9 +1015,9 @@
       InvocationSiteTransformationRecordBuilder callSiteRecord) {
     ClassVisitor visitor = checkNotNull(writer);
 
-    visitor = new ImmutableLabelRemover(visitor);
 
     if (coreLibrarySupport != null) {
+      visitor = new ImmutableLabelRemover(visitor);
       visitor = new EmulatedInterfaceRewriter(visitor, coreLibrarySupport);
       visitor = new CorePackageRenamer(visitor, coreLibrarySupport);
       visitor = new CoreLibraryInvocationRewriter(visitor, coreLibrarySupport);