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-07-14 12:58:33 +0159
commitba5005e95c69e73f48bda2c803583c5558026775 (patch)
treee1514d9424c1d1700a3eab042cbb3bbe83c87599
parent39865ff7edb776634ad054884a6184a26ad2f4b0 (diff)
downloadbuild-ba5005e95c69e73f48bda2c803583c5558026775.tar.gz
build: Allow building with OpenJDKlinaro_android_4.1.1_topic_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 407a529b96..4f5da455d0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -125,7 +125,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 ************************************************************)