diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2013-07-25 08:16:17 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2013-11-03 04:33:09 +0530 |
| commit | 272560f7a042b6c9aa6f8b90cfac1363ca328c92 (patch) | |
| tree | 5abb4625dfd72f5510054301b55d3d762bdc63ce | |
| parent | 503fe9b7d025d502bb62ac498af35bd2206bb291 (diff) | |
| download | build-272560f7a042b6c9aa6f8b90cfac1363ca328c92.tar.gz | |
build: Allow building with OpenJDK v1.7
Ubuntu-12.10 ships with OpenJDK v1.7 and AOSP errors out if you try
to build it with JAVA version other than 1.6. Linaro Android build
with JAVA v1.7, boot tested on Origen 4412, seems to work fine.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | core/main.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/core/main.mk b/core/main.mk index 164e3d35c7..f955d99276 100644 --- a/core/main.mk +++ b/core/main.mk @@ -143,8 +143,8 @@ endif # Check for the corrent jdk ifneq ($(shell java -version 2>&1 | grep -i openjdk),) $(warning ************************************************************) -$(info $(space)) $(warning You are attempting to build with an unsupported JDK.) +$(warning $(space)) $(warning AOSP errors out when using OpenJDK, saying you need to use) $(warning Java SE 1.6 instead.) $(warning A build with OpenJDK seems to work fine though - if you) @@ -157,17 +157,17 @@ endif # Check for the correct version of java java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]') 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: Java SE 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 java.) +$(warning $(space)) +$(warning Your version is: $(shell java -version 2>&1 | head -n 1).) +$(warning The AOSP supported version is: Java SE 1.6.) +$(warning $(space)) +$(warning Linaro builds with java version "1.7.0_09" seems to work fine though.) +$(warning AOSP supported machine setup instructions are at) +$(warning $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) +$(warning ************************************************************) endif # Check for the correct version of javac |