am 89897723: resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp

* commit '89897723ea6f197168c8aa4a58b5aa1b4ba635e1':
  core: OSX: Support 10.9 SDK as well
This commit is contained in:
Ying Wang 2014-10-21 00:58:08 +00:00 committed by Android Git Automerger
commit 298baafdaa

View file

@ -9,7 +9,7 @@ ifndef build_mac_version
build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_versions_supported := 10.6 10.7 10.8
mac_sdk_versions_supported := 10.6 10.7 10.8 10.9
ifneq ($(strip $(MAC_SDK_VERSION)),)
mac_sdk_version := $(MAC_SDK_VERSION)
ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)