diff options
| author | 2019-05-02 15:32:11 +0100 | |
|---|---|---|
| committer | 2019-05-09 15:36:29 +0100 | |
| commit | 0c2143e1ee4d0c1a8f77f953fbc3092f31d8320b (patch) | |
| tree | c9a6921c70eeeeb77325717f44a3bef38f413fd6 /java/java_test.go | |
| parent | 77b47fdf511c9fb3d619789e9f3e72f9a762e96d (diff) | |
Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy
from when the 8 -> 9 toolchain upgrade was happening. That migration
is done and the variable only affects the language level, so it should
have a name that reflects that. (The current situation would be
especially confusing if we started a 9 -> 11 toolchain upgrade,
presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11,
since the two settings look incompatible but are actually orthogonal.)
The current variable historically allowed a value or "1.8" which meant
"use the OpenJDK 9 toolchain but target language level 8". That value
no longer has any meaning and the new variable doesn't allow it.
Bug: 131678633
Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true`
Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53
Test: Audit all mentions of the old string here and downstream
Change-Id: Idad808c7f07913baba1a777627322d5452dabcef
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java_test.go b/java/java_test.go index 3fab43d6d..e4a7fbed2 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -945,8 +945,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", "") @@ -954,9 +954,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) |