commit c5e7577905f2cf352fff408873ec4b51e2c34feb
author Sorin Basca <sorinbasca@google.com> Fri Dec 10 14:21:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 14:21:25 2021 +0000
tree 2ab9d09e1e0c1a17f9873024f5f313eec099fb28
parent 20339c9ebdb8d508268482eed008e6f3acfb2696
parent e2a3edce1337b384485f0eb2da9335eab70abb8f

Allowing Dagger to target newer Java versions am: e2a3edce13

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1904138

Change-Id: Ibcf9bb14f1e2fdaf803354b1cfcc23772fa5778e

Android.bp

diff --git a/Android.bp b/Android.bp
index 7573ab7..57771c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,7 +81,6 @@
         "jsr330",
     ],
 
-    java_version: "1.8",
     sdk_version: "core_current",
 }
 
@@ -105,7 +104,6 @@
         "jsr330",
     ],
 
-    java_version: "1.8",
     sdk_version: "core_current",
 }
 
@@ -178,7 +176,17 @@
         include_dirs: ["external/protobuf/src/"],
     },
 
-    java_version: "1.8",
+    // From Java 9 onward com.sun.tools.javac is not visible by default
+    javacflags: [
+        "--add-modules=jdk.compiler",
+        "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+        "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+    ],
 }
 
 // Compile  dummy implementations of annotations used by dagger2 but not