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

am 1a5a615a: Merge "Update mac_sdk_versions_supported." 

* commit '1a5a615a7b167e4232f3185eef72a7e5b44aef34':
  Update mac_sdk_versions_supported.
This commit is contained in:
Ying Wang 2015-07-30 00:51:24 +00:00 committed by Android Git Automerger
parent 54307a2609 1a5a615a7b
commit bb369efdf8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/mac_version.mk
View File

@ -9,7 +9,7 @@ ifndef build_mac_version
build_mac_version := $(shell sw_vers -productVersion) build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_versions_supported := 10.6 10.7 10.8 10.9 mac_sdk_versions_supported := 10.8 10.9 10.10
ifneq ($(strip $(MAC_SDK_VERSION)),) ifneq ($(strip $(MAC_SDK_VERSION)),)
mac_sdk_version := $(MAC_SDK_VERSION) mac_sdk_version := $(MAC_SDK_VERSION)
ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),) ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)
@ -19,7 +19,7 @@ $(warning ****************************************************************)
$(error Stop.) $(error Stop.)
endif endif
else else
mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sort | sed -e "s/.*macosx//g") mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sed -e "s/.*macosx//g")
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported))) mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported)))
ifeq ($(mac_sdk_version),) ifeq ($(mac_sdk_version),)
mac_sdk_version := $(firstword $(mac_sdk_versions_supported)) mac_sdk_version := $(firstword $(mac_sdk_versions_supported))