diff options
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/sdk.go b/java/sdk.go index 4537f1913..4960ab576 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -66,10 +66,8 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe } else if sdk.FinalOrFutureInt() <= 33 { return JAVA_VERSION_11 } else if ctx.Config().TargetsJava21() { - // Temporary experimental flag to be able to try and build with - // java version 21 options. The flag, if used, just sets Java - // 21 as the default version, leaving any components that - // target an older version intact. + // Build flag that controls whether Java 21 is used as the + // default target version, or Java 17. return JAVA_VERSION_21 } else { return JAVA_VERSION_17 @@ -392,4 +390,8 @@ func sdkMakeVars(ctx android.MakeVarsContext) { ctx.Strict("FRAMEWORK_AIDL", sdkFrameworkAidlPath(ctx).String()) ctx.Strict("API_FINGERPRINT", android.ApiFingerprintPath(ctx).String()) + + if ctx.Config().BuildOS == android.Linux { + ctx.DistForGoals([]string{"sdk", "droidcore"}, android.ApiFingerprintPath(ctx)) + } } |