StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

Browse Source
This commit is contained in:
Pete Gillin
2019-05-10 11:50:08 +00:00
committed by Gerrit Code Review
parent 9c9fd4e73a 0c2143e1ee
commit 42e862c56d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/config.go
View File

@@ -369,14 +369,14 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
}
func (c *config) fromEnv() error {
switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") {
case "", "1.8":
// Nothing, we always use OpenJDK9
switch c.Getenv("EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9") {
case "":
// Nothing, this is the default
case "true":
// Use OpenJDK9 and target 1.9
// Use -source 9 -target 9
c.targetOpenJDK9 = true
default:
return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "1.8", or "true"`)
return fmt.Errorf(`Invalid value for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9, should be "" or "true"`)
}
return nil