commit 73cb9bdb19a9f221685ac4b6afca8f23ac8789c0
author Sorin Basca <sorinbasca@google.com> Tue Sep 27 18:02:06 2022 +0100
committer Sorin Basca <sorinbasca@google.com> Tue Sep 27 18:02:06 2022 +0100
tree 7dcfda9677dce898d6f10df82dfa87981c1ec0c0
parent 96c760a013546a0ad925a00a1b3a7e2f2dd98c81

Unpin staledataclass-annotation-processor from Java 8

Test: m
Fixes: 139342589
Change-Id: Ie4791425a4fcdf551ffa70b2c02ab3ed13e57eaa

Android.bp

diff --git a/Android.bp b/Android.bp
index 0f9977c..c22dafb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -289,6 +289,14 @@
         "staledataclass-annotation-processor",
         "error_prone_android_framework",
     ],
+    // Exports needed for staledataclass-annotation-processor, see b/139342589.
+    javacflags: [
+        "-J--add-modules=jdk.compiler",
+        "-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+        "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+        "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+        "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+    ],
     required: [
         // TODO(b/120066492): remove default_television.xml when the build system
         // propagates "required" properly.