StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Hamilton
2010-06-09 15:42:56 -07:00
committed by Android Git Automerger
parent f83fd362a9 f9f513ab33
commit f597c7beca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -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