Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf352c5d authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Add warning message for java6 builds."

parents e28df19e bee0ec41
Loading
Loading
Loading
Loading
+20 −1
Original line number Diff line number Diff line
@@ -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)