diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-17 18:09:13 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-04-02 13:16:15 +0100 |
| commit | bee0ec41965cd2d12537d80896d1e25ca47c81d2 (patch) | |
| tree | b0dd5e01d0e3fdd790e6a546ce5f3b7743c260b7 | |
| parent | e28df19e0e553f1590e304c02b19559dbee48098 (diff) | |
| download | build-bee0ec41965cd2d12537d80896d1e25ca47c81d2.tar.gz | |
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
| -rw-r--r-- | core/main.mk | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 418c6739e3..ec5721e60d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -103,7 +103,7 @@ include $(BUILD_SYSTEM)/cleanbuild.mk # 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 @@ java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. " 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) |