openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 

am: 42e862c56d

Change-Id: Ibb15d93fcd46afe642834992d25e18c3bf13395f
This commit is contained in:
Pete Gillin 2019-05-10 05:16:29 -07:00 committed by android-build-merger
parent 64ad4e8d72 42e862c56d
commit 350f0987bf
3 changed files with 15 additions and 15 deletions
Show Stats 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

10
java/java_test.go
View File

@ -1007,8 +1007,8 @@ func TestPatchModule(t *testing.T) {
}
`
t.Run("1.8", func(t *testing.T) {
// Test default javac 1.8
t.Run("Java language level 8", func(t *testing.T) {
// Test default javac -source 1.8 -target 1.8
ctx := testJava(t, bp)
checkPatchModuleFlag(t, ctx, "foo", "")
@ -1016,9 +1016,9 @@ func TestPatchModule(t *testing.T) {
checkPatchModuleFlag(t, ctx, "baz", "")
})
t.Run("1.9", func(t *testing.T) {
// Test again with javac 1.9
config := testConfig(map[string]string{"EXPERIMENTAL_USE_OPENJDK9": "true"})
t.Run("Java language level 9", func(t *testing.T) {
// Test again with javac -source 9 -target 9
config := testConfig(map[string]string{"EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9": "true"})
ctx := testContext(config, bp, nil)
run(t, ctx, config)

10
java/sdk_test.go
View File

@ -272,8 +272,8 @@ func TestClasspath(t *testing.T) {
}
}
t.Run("1.8", func(t *testing.T) {
// Test default javac 1.8
t.Run("Java language level 8", func(t *testing.T) {
// Test default javac -source 1.8 -target 1.8
config := testConfig(nil)
if testcase.unbundled {
config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
@ -299,9 +299,9 @@ func TestClasspath(t *testing.T) {
}
})
// Test again with javac 1.9
t.Run("1.9", func(t *testing.T) {
config := testConfig(map[string]string{"EXPERIMENTAL_USE_OPENJDK9": "true"})
// Test again with javac -source 9 -target 9
t.Run("Java language level 9", func(t *testing.T) {
config := testConfig(map[string]string{"EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9": "true"})
if testcase.unbundled {
config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
}