tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Build with OpenJDK 9 -target 1.8 by default (attempt 4).

Browse source 
This is cherry-picked from attempt 3, which was reverted
due to http://b/70862583.

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: art/test/testrunner/run_build_test_target.py -j40 art-interpreter
Test: dalvik/dx/tests/run-all-tests

(cherry picked from commit ab1e54d5f1)

Change-Id: I119be15bd95747722114b970400b740fa47bf9e0
Merged-in: Ic42a518c90515b497e5cecec444ded373e403a4b
This commit is contained in:
Tobias Thierer 2017-11-17 14:06:51 +00:00
parent a52691b12a
commit 294111393e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/config.mk
View file

@ -707,7 +707,11 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \
COLUMN:= column COLUMN:= column
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),) ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
ifeq ($(RUN_ERROR_PRONE),true)
USE_OPENJDK9 := USE_OPENJDK9 :=
else
USE_OPENJDK9 := true
endif
TARGET_OPENJDK9 := TARGET_OPENJDK9 :=
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false) else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
USE_OPENJDK9 := USE_OPENJDK9 :=