diff options
| author | Sorin Basca <sorinbasca@google.com> | 2021-12-10 14:44:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-10 14:44:04 +0000 |
| commit | d46a62a3b68ac6b673bacf7b6607e6f63be412f3 (patch) | |
| tree | 2ab9d09e1e0c1a17f9873024f5f313eec099fb28 | |
| parent | 20339c9ebdb8d508268482eed008e6f3acfb2696 (diff) | |
| parent | c5e7577905f2cf352fff408873ec4b51e2c34feb (diff) | |
| download | dagger2-d46a62a3b68ac6b673bacf7b6607e6f63be412f3.tar.gz | |
Allowing Dagger to target newer Java versions am: e2a3edce13 am: c5e7577905
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1904138
Change-Id: I82f100e4a1d68f106e0550f781a26266fabbdbc4
| -rw-r--r-- | Android.bp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 7573ab763..57771c5f5 100644 --- a/Android.bp +++ b/Android.bp @@ -81,7 +81,6 @@ java_library { "jsr330", ], - java_version: "1.8", sdk_version: "core_current", } @@ -105,7 +104,6 @@ java_library { "jsr330", ], - java_version: "1.8", sdk_version: "core_current", } @@ -178,7 +176,17 @@ java_library_host { 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 |