Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: 42e862c56d

am: 350f0987bf

Change-Id: Ibfc75aa4c4356d86cf7ce80becff0cf92cf98e14
This commit is contained in:
Pete Gillin
2019-05-10 05:22:48 -07:00
committed by android-build-merger
3 changed files with 15 additions and 15 deletions

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)

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)
}