aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-11-17 07:48:16 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-03-29 10:16:16 +0200
commit904fca7c7c38e29d307c2d795987e1fc26eed270 (patch)
tree5711e3fdce3648f116b95486ffe203886e955f6d
parent0d08d1e1d593f1f89f5a79e4a1a0c4d3b56361c2 (diff)
downloadbuild-904fca7c7c38e29d307c2d795987e1fc26eed270.tar.gz
build: Allow building with OpenJDK
My local builds with OpenJDK have been successful - no reason to disallow it, let's go free... Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--core/main.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk
index 1fcacb0609..32f2b302b3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -124,7 +124,14 @@ endif
# Check for the correct version of java
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 :=
+$(warning ************************************************************)
+$(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)
+$(warning run into any Java errors, you may want to try using the)
+$(warning version required by AOSP though.)
+$(warning ************************************************************)
+#java_version :=
endif
ifeq ($(strip $(java_version)),)
$(info ************************************************************)