diff options
| author | Tom Giordano <tomgiordano83@gmail.com> | 2011-11-19 02:39:54 +1100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-07-10 11:50:31 -0700 |
| commit | a9d9e674dcadf1449bc9092408d840214c23eab9 (patch) | |
| tree | 3c9f1e44e00e2d0526703019edcf26e6f527be99 /core | |
| parent | 22ddeaaf84a321616be66fc2e8e1ebd4779e6035 (diff) | |
| download | build-a9d9e674dcadf1449bc9092408d840214c23eab9.zip build-a9d9e674dcadf1449bc9092408d840214c23eab9.tar.gz build-a9d9e674dcadf1449bc9092408d840214c23eab9.tar.bz2 | |
build: allow use of openjdk and other versions of make
Change-Id: I2e3c7f89ce51888afb9cda30eeaf6d757b057e2e
Diffstat (limited to 'core')
| -rw-r--r-- | core/main.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index 407a529..757caea 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 @@ -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).) @@ -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 |