commit 710e0265bc5f70398e7c070941ae6af34bf5c5d5
author Ying Wang <wangying@google.com> Mon Mar 31 18:17:22 2014 -0700
committer Ying Wang <wangying@google.com> Mon Mar 31 18:17:22 2014 -0700
tree c8bad10a15f4c15a344e3cc7902b7180c6e26ec6
parent 707354c0ad06fbca6154b69d6453577df61611db
parent f966bda49f4fdf749c91b30e9819c85ca9dab063

resolved conflicts for merge of f966bda4 to master

Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 6d98e94..8455204 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -183,13 +183,13 @@
 ifneq ($(EXPERIMENTAL_USE_JAVA7),)
 required_version := "1.7.x"
 required_javac_version := "1.7"
-java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]')
-javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]')
+java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1)
+javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]' | head -n 1)
 else # if EXPERIMENTAL_USE_JAVA7
 required_version := "1.6.x"
 required_javac_version := "1.6"
-java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]')
-javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]')
+java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1)
+javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]' | head -n 1)
 endif # if EXPERIMENTAL_USE_JAVA7
 
 ifeq ($(required_javac_version), "1.6")