tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Delete check for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

Browse source
This commit is contained in:
Jingwen Chen 2020-11-24 01:12:02 +00:00 committed by Gerrit Code Review
commit 1ad9dc00a0
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android/config.go
View file

@ -263,10 +263,6 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
config.mockFileSystem(bp, fs) config.mockFileSystem(bp, fs)
if err := config.fromEnv(); err != nil {
panic(err)
}
return Config{config} 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] 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) { if Bool(config.productVariables.GcovCoverage) && Bool(config.productVariables.ClangCoverage) {
return Config{}, fmt.Errorf("GcovCoverage and ClangCoverage cannot both be set") 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 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 { func (c *config) StopBefore() bootstrap.StopBefore {
return c.stopBefore return c.stopBefore
} }