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

Commit 304f5194 authored by Tim Roes's avatar Tim Roes
Browse files

Fixed error message for using OpenJDK. 



Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".

Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: default avatarTim Roes <tim.roes88@googlemail.com>
parent 33b190f6

core/main.mk

+11 −3
Original line number Diff line number Diff line
@@ -121,12 +121,20 @@ $(warning ************************************************************) 
$(error Directory names containing spaces not supported)

endif



# Check for the corrent jdk

ifneq ($(shell java -version 2>&1 | grep -i openjdk),)

$(info ************************************************************)

$(info You are attempting to build with an unsupported JDK.)

$(info $(space))

$(info You use OpenJDK but only Sun/Oracle JDK is supported.)

$(info Please follow the machine setup instructions at)

$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)

$(info ************************************************************)

$(error stop)

endif



# Check for the correct version of java

java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]')

ifneq ($(shell java -version 2>&1 | grep -i openjdk),)

java_version :=

endif

ifeq ($(strip $(java_version)),)

$(info ************************************************************)

$(info You are attempting to build with the incorrect version)