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

Commit 703f4958 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
parents d7fcea20 68f9303c

core/main.mk

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") \>= 3.81)) 
$(warning ********************************************************************************)

$(warning *  You are using version $(MAKE_VERSION) of make.)

$(warning *  You must upgrade to version 3.81 or greater.)

$(warning *  see http://source.android.com/download)

$(warning *  see http://source.android.com/source/download.html)

$(warning ********************************************************************************)

$(error stopping)

endif
@@ -124,7 +124,7 @@ $(info Your version is: $(shell java -version 2>&1 | head -n 1).) 
$(info The correct version is: 1.6.)

$(info $(space))

$(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/source/download.html)

$(info ************************************************************)

$(error stop)

endif
@@ -140,7 +140,7 @@ $(info Your version is: $(shell javac -version 2>&1 | head -n 1).) 
$(info The correct version is: 1.6.)

$(info $(space))

$(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/source/download.html)

$(info ************************************************************)

$(error stop)

endif