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

Commit 3c60c67a authored Jun 01, 2011 by Jean-Baptiste Queru

Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b

parents e2419c89 8cbdef7e

core/config.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,12 @@ else
		HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
		endif

		# Is the host JDK 64-bit version?
		HOST_JDK_IS_64BIT_VERSION :=
		ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
		HOST_JDK_IS_64BIT_VERSION := true
		endif

		# It's called md5 on Mac OS and md5sum on Linux
		ifeq ($(HOST_OS),darwin)
		MD5SUM:=md5 -q

core/main.mk

+0 −11

Original line number	Diff line number	Diff line
		@@ -70,17 +70,6 @@ ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))

		$(info Checking build tools versions...)

		ifeq ($(BUILD_OS),linux)
		build_arch := $(shell uname -m)
		ifneq (64,$(findstring 64,$(build_arch)))
		$(warning ************************************************************)
		$(warning You are attempting to build on a 32-bit system.)
		$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
		$(warning ************************************************************)
		$(error stop)
		endif
		endif

		ifneq ($(HOST_OS),windows)
		ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
		# check for a case sensitive file system