Delete check for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.

This has been a no-op for a year now. a1c9e9da55

Test: TH presubmit
Change-Id: Id9cc56045cbca4ebae64170e5443501b9ccc8260
This commit is contained in:
Jingwen Chen
2020-11-23 05:00:36 -05:00
parent b26070efef
commit 17d690c8b0

View File

@@ -263,10 +263,6 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
config.mockFileSystem(bp, fs)
if err := config.fromEnv(); err != nil {
panic(err)
}
return Config{config}
}
@@ -436,10 +432,6 @@ func NewConfig(srcDir, buildDir string, moduleListFile string) (Config, error) {
config.AndroidFirstDeviceTarget = firstTarget(config.Targets[Android], "lib64", "lib32")[0]
}
if err := config.fromEnv(); err != nil {
return Config{}, err
}
if Bool(config.productVariables.GcovCoverage) && Bool(config.productVariables.ClangCoverage) {
return Config{}, fmt.Errorf("GcovCoverage and ClangCoverage cannot both be set")
}
@@ -487,17 +479,6 @@ func (c *config) mockFileSystem(bp string, fs map[string][]byte) {
c.mockBpList = blueprint.MockModuleListFile
}
func (c *config) fromEnv() error {
switch c.Getenv("EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9") {
case "", "true":
// Do nothing
default:
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
}
func (c *config) StopBefore() bootstrap.StopBefore {
return c.stopBefore
}