Setting Java 11 as the default version

Test: m
Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70
This commit is contained in:
Sorin Basca
2022-01-12 16:04:50 +00:00
parent 07d858468e
commit 171c2103b8
5 changed files with 4 additions and 35 deletions

View File

@@ -1392,10 +1392,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
Srcs []string
Javacflags []string
}
Openjdk11 struct {
Srcs []string
Javacflags []string
}
Dist struct {
Targets []string
Dest *string
@@ -1422,8 +1418,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
}
props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs
props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
props.Openjdk11.Srcs = module.properties.Openjdk11.Srcs
props.Openjdk11.Javacflags = module.properties.Openjdk11.Javacflags
// We compile the stubs for 1.8 in line with the main android.jar stubs, and potential
// interop with older developer tools that don't support 1.9.
props.Java_version = proptools.StringPtr("1.8")