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

@@ -122,14 +122,6 @@ type CommonProperties struct {
Javacflags []string
}
Openjdk11 struct {
// List of source files that should only be used when passing -source 1.9 or higher
Srcs []string `android:"path"`
// List of javac flags that should only be used when passing -source 1.9 or higher
Javacflags []string
}
// When compiling language level 9+ .java code in packages that are part of
// a system module, patch_module names the module that your sources and
// dependencies should be patched into. The Android runtime currently
@@ -976,9 +968,6 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
if flags.javaVersion.usesJavaModules() {
j.properties.Srcs = append(j.properties.Srcs, j.properties.Openjdk9.Srcs...)
}
if ctx.Config().TargetsJava11() {
j.properties.Srcs = append(j.properties.Srcs, j.properties.Openjdk11.Srcs...)
}
srcFiles := android.PathsForModuleSrcExcludes(ctx, j.properties.Srcs, j.properties.Exclude_srcs)
if hasSrcExt(srcFiles.Strings(), ".proto") {