From ab1e54d5f1389314de49ca5aa3003e33b9d4aba7 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 17 Nov 2017 14:06:51 +0000 Subject: [PATCH] Build with OpenJDK 9 -target 1.8 by default except for errorprone. (This is cherry-picked from the first attempt to submit this CL topic, which was reverted after 3 hours because of bug 70286093; robolectric 3.{1.1,4.2} now stick with OpenJDK 8 to avoid that bug). Before this CL topic, the build toolchain for .java source files used OpenJDK 8, targeting 1.8 (v52 class files) by default. This CL topic switches the default to OpenJDK 9, but still targeting 1.8 (v52 class files) by default. If USE_ERROR_PRONE is set to true, then the default remains OpenJDK 8. Code in the Android platform should generally be unaffected, but if host tools that are now compiled and run using OpenJDK 9 are causing problems for your team, then let me know. To manually switch back to the old behavior for now (continue using OpenJDK 8), run this command in your shell: export EXPERIMENTAL_USE_OPENJDK9=false Bug: 69449021 Test: Treehugger Test: Running robolectric tests succeeds on internal-master after cherry-picking this CL topic, using the command line from http://b/70286093#comment1 (cherry picked from commit 5f36a62622840e121a5276acbdfa8d548744d4e5) Change-Id: I4972c714ed80c35328895e88675b56bf0e195c01 --- core/config.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/config.mk b/core/config.mk index d7e6f1e5a..a6e0c2ce0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -699,7 +699,11 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \ 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 :=