diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/core-libraries/Android.bp | 17 | ||||
| -rw-r--r-- | java/sdk.go | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp index da865404b..8c808e4b9 100644 --- a/java/core-libraries/Android.bp +++ b/java/core-libraries/Android.bp @@ -132,10 +132,10 @@ java_library { // prebuilts/sdk/update_prebuilts.py script to update the prebuilts/sdk // directory. java_library { - name: "core-current-stubs-for-system-modules", + name: "core-current-stubs-for-system-modules-exportable", visibility: ["//development/sdk"], static_libs: [ - "core.current.stubs", + "core.current.stubs.exportable", // This one is not on device but it's needed when javac compiles code // containing lambdas. "core-lambda-stubs-for-system-modules", @@ -155,6 +155,19 @@ java_library { ], } +java_library { + name: "core-current-stubs-for-system-modules", + visibility: ["//development/sdk"], + static_libs: [ + "core.current.stubs", + // This one is not on device but it's needed when javac compiles code + // containing lambdas. + "core-lambda-stubs-for-system-modules", + ], + sdk_version: "none", + system_modules: "none", +} + // Defaults module to strip out android annotations java_defaults { name: "system-modules-no-annotations", diff --git a/java/sdk.go b/java/sdk.go index 036521c86..bb2aa8d7e 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -65,8 +65,6 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_9 } else if sdk.FinalOrFutureInt() <= 33 { return JAVA_VERSION_11 - } else if sdk.FinalOrFutureInt() <= 35 { - return JAVA_VERSION_17 } else if ctx.Config().TargetsJava21() { // Build flag that controls whether Java 21 is used as the // default target version, or Java 17. |