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
This commit is contained in:
@@ -598,7 +598,7 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule
|
||||
// Droiddoc always gets "-source 1.8" because it doesn't support 1.9 sources. For modules with 1.9
|
||||
// sources, droiddoc will get sources produced by metalava which will have already stripped out the
|
||||
// 1.9 language features.
|
||||
cmd.FlagWithArg("-source ", "1.8").
|
||||
cmd.FlagWithArg("-source ", getStubsJavaVersion().String()).
|
||||
Flag("-J-Xmx1600m").
|
||||
Flag("-J-XX:-OmitStackTraceInFastThrow").
|
||||
Flag("-XDignore.symbol.file").
|
||||
|
@@ -521,6 +521,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 (
|
||||
@@ -1718,6 +1723,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{},
|
||||
|
Reference in New Issue
Block a user