diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2012-11-02 09:16:55 +0100 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-12-01 01:12:42 +0100 |
| commit | f1c47264d573131da620a75485ad37e88a935a32 (patch) | |
| tree | 0ddead98122ed69ee90ef06c8c4a5e44f7e373f3 | |
| parent | e820dfa83c32114919c129907d5410fcd350f32f (diff) | |
| download | build-f1c47264d573131da620a75485ad37e88a935a32.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.
Change-Id: I8ca783b48de80131f830139a33d8fc0aa92c562c
| -rw-r--r-- | core/main.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/main.mk b/core/main.mk index 56a62a9873..5742a1475a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -136,16 +136,16 @@ $(warning ************************************************************) endif ifeq ($(strip $(java_version)),) $(info ************************************************************) -$(info You are attempting to build with the incorrect version) -$(info of java.) +$(info You are attempting to build with the unsupported version 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 The AOSP supported version is: Java SE 1.6.) $(info $(space)) -$(info Please follow the machine setup instructions at) +$(info Linaro builds with java version "1.7.0_09" seems to work fine though.) +$(info AOSP supported machine setup instructions are at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) $(info ************************************************************) -$(error stop) +#$(error stop) endif # Check for the correct version of javac |