Loading core/main.mk +2 −4 Original line number Diff line number Diff line Loading @@ -44,10 +44,9 @@ ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81)) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82)) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) $(warning * Android can only be built by versions 3.81 and 3.82.) $(warning * Android is tested to build with versions 3.81 and 3.82.) $(warning * see https://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif endif endif Loading Loading @@ -129,7 +128,7 @@ java_version := endif ifeq ($(strip $(java_version)),) $(info ************************************************************) $(info You are attempting to build with the incorrect version) $(info You are attempting to build with an unsupported version) $(info of java.) $(info $(space)) $(info Your version is: $(shell java -version 2>&1 | head -n 1).) Loading @@ -138,7 +137,6 @@ $(info $(space)) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) $(info ************************************************************) $(error stop) endif # Check for the correct version of javac Loading Loading
core/main.mk +2 −4 Original line number Diff line number Diff line Loading @@ -44,10 +44,9 @@ ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81)) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82)) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) $(warning * Android can only be built by versions 3.81 and 3.82.) $(warning * Android is tested to build with versions 3.81 and 3.82.) $(warning * see https://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif endif endif Loading Loading @@ -129,7 +128,7 @@ java_version := endif ifeq ($(strip $(java_version)),) $(info ************************************************************) $(info You are attempting to build with the incorrect version) $(info You are attempting to build with an unsupported version) $(info of java.) $(info $(space)) $(info Your version is: $(shell java -version 2>&1 | head -n 1).) Loading @@ -138,7 +137,6 @@ $(info $(space)) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) $(info ************************************************************) $(error stop) endif # Check for the correct version of javac Loading