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

Commit 015c7885 authored by Conley Owens's avatar Conley Owens Committed by Android (Google) Code Review
Browse files

Merge "Get build system to work with Make 3.82"

parents 4630c321 d7a1a9b4

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ define _get-package-overrides 
endef



define get-package-overrides

$(strip $(sort $(call _get-package-overrides,$(1))))

$(sort $(strip $(call _get-package-overrides,$(1))))

endef



###########################################################

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -41,14 +41,16 @@ endif 
# (Allow any version under Cygwin since we don't actually build the platform there.)

ifeq (,$(findstring CYGWIN,$(shell uname -sm)))

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 version 3.81.)

$(warning *  Android can only be built by versions 3.81 and 3.82.)

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

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

$(error stopping)

endif

endif

endif



TOP := .

TOPDIR :=