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

Commit 9d14d317 authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Fix for Java 8 toolchain builds"

parents b7462534 e8304ef7

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) 
ifneq ($(EXPERIMENTAL_USE_JAVA8),)

required_version := "1.8.x"

required_javac_version := "1.8"

java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]')

java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.8[\. "$$]')

javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]')

else # default

required_version := "1.7.x"