diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 11 | ||||
| -rw-r--r-- | java/java.go | 8 | ||||
| -rw-r--r-- | java/sdk.go | 10 | ||||
| -rw-r--r-- | java/sdk_library.go | 6 |
4 files changed, 4 insertions, 31 deletions
diff --git a/java/base.go b/java/base.go index 63328c89d..a3eb8de21 100644 --- a/java/base.go +++ b/java/base.go @@ -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") { diff --git a/java/java.go b/java/java.go index bb7c32be8..e3e972153 100644 --- a/java/java.go +++ b/java/java.go @@ -450,14 +450,8 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an return normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() { return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) - } else if ctx.Config().TargetsJava11() { - // Temporary experimental flag to be able to try and build with - // java version 11 options. The flag, if used, just sets Java - // 11 as the default version, leaving any components that - // target an older version intact. - return JAVA_VERSION_11 } else { - return JAVA_VERSION_9 + return JAVA_VERSION_11 } } diff --git a/java/sdk.go b/java/sdk.go index 756a24deb..0dddd40aa 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -55,14 +55,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_7 } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 - } else if ctx.Config().TargetsJava11() { - // Temporary experimental flag to be able to try and build with - // java version 11 options. The flag, if used, just sets Java - // 11 as the default version, leaving any components that - // target an older version intact. - return JAVA_VERSION_11 - } else { + } else if sdk.FinalOrFutureInt() <= 31 { return JAVA_VERSION_9 + } else { + return JAVA_VERSION_11 } } diff --git a/java/sdk_library.go b/java/sdk_library.go index 7849f96f5..57ab2686f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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") |