Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.
(cherry picked from 8c06afdea3d3c422d653b40fd19d5e3d4be64af2)
Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
diff --git a/core/main.mk b/core/main.mk
index 418c673..ec5721e 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -103,7 +103,7 @@
# Include the google-specific config
-include vendor/google/build/config.mk
-VERSION_CHECK_SEQUENCE_NUMBER := 3
+VERSION_CHECK_SEQUENCE_NUMBER := 4
-include $(OUT_DIR)/versions_checked.mk
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -196,6 +196,25 @@
javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]' | head -n 1)
endif # if EXPERIMENTAL_USE_JAVA7
+ifeq ($(required_javac_version), "1.6")
+$(info ************************************************************)
+$(info You are attempting to build with java 1.6.)
+$(info Java6 support for master builds will be dropped shortly,)
+$(info please upgrade to Java7 as soon as possible.)
+$(info $(space))
+$(info Visit http://source.android.com/source/initializing.html#installing-the-jdk for details. )
+$(info $(space))
+$(info To build using java-7:)
+$(info $(space))
+$(info $$ export EXPERIMENTAL_USE_JAVA7=true)
+$(info $$ . build/envsetup.sh)
+$(info $$ lunch <target>)
+$(info $$ make clobber)
+$(info $$ make -j8)
+$(info $(space))
+$(info ************************************************************)
+endif
+
ifeq ($(strip $(java_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)