diff options
| author | 2022-01-25 05:51:25 +0000 | |
|---|---|---|
| committer | 2022-01-25 05:51:25 +0000 | |
| commit | eb76d218e99e2d6de2e348565dd35d0ece83f0f9 (patch) | |
| tree | e08913b441218d6404d0b49c7a1b233da976f524 /java/base.go | |
| parent | a1f50efd3a03b6eb583baf11596df628e9e5c242 (diff) | |
| parent | 18ecf61090cd987e049aadfea6371ea4ca651b06 (diff) | |
Merge "Revert^2: "Setting Java 11 as the default version""
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 11 |
1 files changed, 0 insertions, 11 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") { |