Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a902b416 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

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

am: 1644e2f1

Change-Id: Iafd0db73afc0d6ce831eb97f1bafbc1cd04fb8f4
parents c9f5afb0 1644e2f1

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -705,7 +705,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 :=