aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-11 04:02:40 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-11 04:02:40 +0000
commite22352219e14d5bf0f630367b5dbd607e976b143 (patch)
tree2ab9d09e1e0c1a17f9873024f5f313eec099fb28
parent2340f3699535c4c714d3104bab97bedbbf9305ca (diff)
parentecf36156ea967499fa5f63b1c0f47c88780c4982 (diff)
downloaddagger2-android13-d1-s1-release.tar.gz
Change-Id: I08e495005fbed664b0a653a532cafd1518283add
-rw-r--r--Android.bp14
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