diff options
| -rw-r--r-- | android/config.go | 15 | ||||
| -rw-r--r-- | java/config/makevars.go | 6 | ||||
| -rw-r--r-- | java/droiddoc.go | 8 | ||||
| -rw-r--r-- | java/java.go | 2 |
4 files changed, 5 insertions, 26 deletions
diff --git a/android/config.go b/android/config.go index e208dcd21..90e7ed187 100644 --- a/android/config.go +++ b/android/config.go @@ -113,8 +113,6 @@ type config struct { captureBuild bool // true for tests, saves build parameters for each module ignoreEnvironment bool // true for tests, returns empty from all Getenv calls - targetOpenJDK9 bool // Target 1.9 - stopBefore bootstrap.StopBefore OncePer @@ -392,13 +390,9 @@ func NewConfig(srcDir, buildDir string) (Config, error) { func (c *config) fromEnv() error { switch c.Getenv("EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9") { case "", "true": - // Use -source 9 -target 9. This is the default. - c.targetOpenJDK9 = true - case "false": - // Use -source 8 -target 8. This is the legacy behaviour. - c.targetOpenJDK9 = false + // Do nothing default: - return fmt.Errorf(`Invalid value for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9, should be "", "true", or "false"`) + return fmt.Errorf("The environment variable EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9 is no longer supported. Java language level 9 is now the global default.") } return nil @@ -779,11 +773,6 @@ func (c *config) EmitXrefRules() bool { return c.XrefCorpusName() != "" } -// Returns true if -source 1.9 -target 1.9 is being passed to javac -func (c *config) TargetOpenJDK9() bool { - return c.targetOpenJDK9 -} - func (c *config) ClangTidy() bool { return Bool(c.productVariables.ClangTidy) } diff --git a/java/config/makevars.go b/java/config/makevars.go index 2fa6f8969..981a73638 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -29,12 +29,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES", strings.Join(DefaultBootclasspathLibraries, " ")) ctx.Strict("DEFAULT_SYSTEM_MODULES", DefaultSystemModules) - if ctx.Config().TargetOpenJDK9() { - ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.9") - } else { - ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.8") - } - ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}") ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}") ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}") diff --git a/java/droiddoc.go b/java/droiddoc.go index 12335ff25..1091331c3 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -425,16 +425,12 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) { if sdkDep.hasStandardLibs() { if sdkDep.useDefaultLibs { ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...) - if ctx.Config().TargetOpenJDK9() { - ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules) - } + ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules) if sdkDep.hasFrameworkLibs() { ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...) } } else if sdkDep.useModule { - if ctx.Config().TargetOpenJDK9() { - ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules) - } + ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules) ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.modules...) } } else if sdkDep.systemModules != "" { diff --git a/java/java.go b/java/java.go index be48256af..71d009880 100644 --- a/java/java.go +++ b/java/java.go @@ -884,7 +884,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd ret = normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() && sdk <= 23 { ret = "1.7" - } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { + } else if ctx.Device() && sdk <= 29 { ret = "1.8" } else if ctx.Device() && sdkContext.sdkVersion() != "" && |