diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-05-23 10:35:30 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-05-23 10:35:30 +0530 |
| commit | 19a15eed1b575c18dfbe17ae4ed394437b937126 (patch) | |
| tree | d63bb55a903adb868c7c70d674ccb455ae11752c | |
| parent | ce01a5193c08b2f4afe8ea5a8ed0153d5241c9ee (diff) | |
| download | build-linaro_android_4.4.2.tar.gz | |
Allow javac 1.7 to be used for buildinglinaro_android_4.4.2
Change-Id: I6034488ec5b391899afed08beec279954a0aa6cb
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | core/main.mk | 22 |
1 files 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 |