From 19a15eed1b575c18dfbe17ae4ed394437b937126 Mon Sep 17 00:00:00 2001 From: Vishal Bhoj Date: Fri, 23 May 2014 10:35:30 +0530 Subject: Allow javac 1.7 to be used for building Change-Id: I6034488ec5b391899afed08beec279954a0aa6cb Signed-off-by: Vishal Bhoj --- core/main.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/main.mk b/core/main.mk index bab8c5d8f3..184c7e9bdd 100644 --- a/core/main.mk +++ b/core/main.mk @@ -175,17 +175,17 @@ endif # Check for the correct version of javac javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') ifeq ($(strip $(javac_version)),) -$(info ************************************************************) -$(info You are attempting to build with the incorrect version) -$(info of javac.) -$(info $(space)) -$(info Your version is: $(shell javac -version 2>&1 | head -n 1).) -$(info The correct version is: 1.6.) -$(info $(space)) -$(info Please follow the machine setup instructions at) -$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) -$(info ************************************************************) -$(error stop) +$(warning ************************************************************) +$(warning You are attempting to build with the incorrect version) +$(warning of javac.) +$(warning $(space)) +$(warning Your version is: $(shell javac -version 2>&1 | head -n 1).) +$(warning The correct version is: 1.6.) +$(warning $(space)) +$(warning Please follow the machine setup instructions at) +$(warning $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) +$(warning ************************************************************) +#$(error stop) endif ifndef BUILD_EMULATOR -- cgit v1.2.3