Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on... (f9f513ab) · Commits · e / os / android_build

core/main.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -117,7 +117,7 @@ $(info $(space))
	$(info Please follow the machine setup instructions at)		$(info Please follow the machine setup instructions at)
	$(info $(space)$(space)$(space)$(space)http://source.android.com/download)		$(info $(space)$(space)$(space)$(space)http://source.android.com/download)
	$(info ************************************************************)		$(info ************************************************************)
	$(error stop)		#$(error stop)
	endif		endif

	# Check for the correct version of javac		# Check for the correct version of javac
	@@ -133,7 +133,7 @@ $(info $(space))
	$(info Please follow the machine setup instructions at)		$(info Please follow the machine setup instructions at)
	$(info $(space)$(space)$(space)$(space)http://source.android.com/download)		$(info $(space)$(space)$(space)$(space)http://source.android.com/download)
	$(info ************************************************************)		$(info ************************************************************)
	$(error stop)		#$(error stop)
	endif		endif

	endif # windows		endif # windows