| commit | d4760b3eed2afccf3a178ea28b6453ea9963ee90 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Wed Dec 06 11:05:31 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 06 11:05:31 2017 +0000 |
| tree | 0c35106a04d0ab527c890de2ff67cd3967e280fa | |
| parent | 291768ef7f336f36787c803685990cab11aab390 [diff] | |
| parent | 5f36a62622840e121a5276acbdfa8d548744d4e5 [diff] |
Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
diff --git a/core/config.mk b/core/config.mk index 5fd2993..d4dae70 100644 --- a/core/config.mk +++ b/core/config.mk
@@ -690,7 +690,11 @@ COLUMN:= column ifeq ($(EXPERIMENTAL_USE_OPENJDK9),) +ifeq ($(RUN_ERROR_PRONE),true) USE_OPENJDK9 := +else +USE_OPENJDK9 := true +endif TARGET_OPENJDK9 := else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false) USE_OPENJDK9 :=