p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fc76f0eb: am 2ea957a3: Merge "Revise checks for MacOSX to build emulator" 

* commit 'fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1':
  Revise checks for MacOSX to build emulator
This commit is contained in:
Andrew Hsieh 2012-11-09 11:12:42 -08:00 committed by Android Git Automerger
parent 00f2432653 fc76f0eb17
commit 60a34ed501
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/main.mk
View File

@ -158,7 +158,7 @@ $(error stop)
endif endif
ifeq (darwin,$(HOST_OS)) ifeq (darwin,$(HOST_OS))
GCC_REALPATH = $(realpath $(shell which gcc)) GCC_REALPATH = $(realpath $(shell which $(HOST_CC)))
ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),) ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)
# Using LLVM GCC results in a non functional emulator due to it # Using LLVM GCC results in a non functional emulator due to it
# not honouring global register variables # not honouring global register variables
@ -170,23 +170,6 @@ ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)
else else
BUILD_EMULATOR := true BUILD_EMULATOR := true
endif endif
# When building on Leopard or above, we need to use the 10.4 SDK
# or the generated binary will not run on Tiger.
darwin_version := $(strip $(shell sw_vers -productVersion))
ifneq ($(filter 10.1 10.2 10.3 10.1.% 10.2.% 10.3.% 10.4 10.4.%,$(darwin_version)),)
$(error Building the Android emulator requires OS X 10.5 or above)
endif
ifneq ($(filter 10.5 10.5.% 10.6 10.6.%,$(darwin_version)),)
# We are on Leopard or Snow Leopard
MSDK=10.5
else
# We are on Lion or beyond, and 10.6 SDK is the minimum in Xcode 4.x
MSDK=10.6
endif
MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk
ifeq ($(strip $(wildcard $(MACOSX_SDK))),)
BUILD_EMULATOR := false
endif
else # HOST_OS is not darwin else # HOST_OS is not darwin
BUILD_EMULATOR := true BUILD_EMULATOR := true
endif # HOST_OS is darwin endif # HOST_OS is darwin