summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2022-12-22 21:26:06 +0000
committer Jihoon Kang <jihoonkang@google.com> 2022-12-28 00:27:11 +0000
commitfc9623bb28f08ab05513b9ea8919deb1740462a8 (patch)
tree5ddee4ba55def4645c68406927b1f238617e7e4d /java/java.go
parent09ff3deef5ef2f70299eab805c28576616e4e8ec (diff)
Set Java version for java_api_library module
Currently, stubs are compiled with Java version 1.8. To align with this, set the java version passed to javac invocation as 1.8 for java_api_library module. Helper function is used to sync the java version of droiddoc module and java_api_library module. Test: m Change-Id: I103b94aed9747a2f2dd65d13de0ae9c0f33db5c0 Merged-In: I103b94aed9747a2f2dd65d13de0ae9c0f33db5c0
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 7a1f53231..5a3a2e0a3 100644
--- a/java/java.go
+++ b/java/java.go
@@ -503,6 +503,11 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an
}
}
+// Java version for stubs generation
+func getStubsJavaVersion() javaVersion {
+ return JAVA_VERSION_8
+}
+
type javaVersion int
const (
@@ -1625,6 +1630,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), "android.jar")
var flags javaBuilderFlags
+ flags.javaVersion = getStubsJavaVersion()
flags.javacFlags = strings.Join(al.properties.Javacflags, " ")
TransformJavaToClasses(ctx, al.stubsJar, 0, android.Paths{},