am f9f513ab: Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken

This commit is contained in:
Jeff Hamilton 2010-06-09 15:42:56 -07:00 committed by Android Git Automerger
commit f597c7beca

View file

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