diff options
| author | Sorin Basca <sorinbasca@google.com> | 2021-12-10 15:13:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-10 15:13:30 +0000 |
| commit | ecf36156ea967499fa5f63b1c0f47c88780c4982 (patch) | |
| tree | 2ab9d09e1e0c1a17f9873024f5f313eec099fb28 | |
| parent | 59f12ab265041460e139870b6d0a2d1c26f097c5 (diff) | |
| parent | 2ce963a6f6a728600dd2a92fbfc19b752dbc5eba (diff) | |
| download | dagger2-android13-frc-conscrypt-release.tar.gz | |
Allowing Dagger to target newer Java versions am: e2a3edce13 am: c5e7577905 am: d46a62a3b6 am: 2ce963a6f6t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_330810010aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1904138
Change-Id: I236fd00f7934bdedad125a9a4a430b1183a45863
| -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 |