commit d7d096df71c65cbcd35def83bdb4f7cc86c3f290
author Jean-Baptiste Queru <jbq@google.com> Fri Oct 08 10:58:38 2010 -0700
committer Jason Chen <jasonchen@google.com> Thu Aug 25 11:29:54 2011 -0700
tree 200d65343b6825bde611c04ec59f8081baba0bb0
parent 6e41a7483aea711cb81c2223724c421468872803

Tighten the toolchain version check

Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a616875..ef6c684 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -113,14 +113,17 @@
 
 
 # Check for the correct version of java
-java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]')
+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)
 $(info of java.)
 $(info $(space))
 $(info Your version is: $(shell java -version 2>&1 | head -n 1).)
-$(info The correct version is: 1.6.)
+$(info The correct version is: Java SE 1.6.)
 $(info $(space))
 $(info Please follow the machine setup instructions at)
 $(info $(space)$(space)$(space)$(space)http://source.android.com/source/download.html)