Avoid factory methods when desugaring lambda expressions and this:: method references for android

RELNOTES: no factory methods generated for lambda expressions on android

--
PiperOrigin-RevId: 150952237
MOS_MIGRATED_REVID=150952237

1 files changed, 6 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
index e942c95b6e..dea633904f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
@@ -117,10 +117,16 @@ class LambdaClassFixer extends ClassVisitor {
     }
     if (FACTORY_METHOD_NAME.equals(name)) {
       hasFactory = true;
+      if (!lambdaInfo.needFactory()) {
+        return null; // drop generated factory method if we won't call it
+      }
       access &= ~Opcodes.ACC_PRIVATE; // make factory method accessible
     } else if ("<init>".equals(name)) {
       this.desc = desc;
       this.signature = signature;
+      if (!lambdaInfo.needFactory() && !desc.startsWith("()")) {
+        access &= ~Opcodes.ACC_PRIVATE; // make constructor accessible if we'll call it directly
+      }
     }
     MethodVisitor methodVisitor =
         new LambdaClassMethodRewriter(super.visitMethod(access, name, desc, signature, exceptions));